diff --git a/web/lib/html_themes.ssjs b/web/lib/html_themes.ssjs
index 5ade0f36551ee43744231b6d90da73c3d76664e0..14a4b719559c249037219fdf373718809a455370 100644
--- a/web/lib/html_themes.ssjs
+++ b/web/lib/html_themes.ssjs
@@ -5,13 +5,16 @@
 Themes=new Object;
 
 load('../web/templates/html_themes.ssjs');
+
+prefs_dir=system.data_dir + 'user/';
+
 var CurrTheme=DefaultTheme;
 
 /* Read in current users selected theme if it exists */
-if(file_exists(system.data_dir+'user/'+format("%04d.html_prefs",user.number))) {
-  prefsfile=new File(system.data_dir+'user/'+format("%04d.html_prefs",user.number));
+if(file_exists(prefs_dir +format("%04d.html_prefs",user.number))) {
+  prefsfile=new File(prefs_dir +format("%04d.html_prefs",user.number));
   if(prefsfile.open("r",false)) {
-  CurrTheme=prefsfile.iniGetValue(null, 'CurrTheme');
+  CurrTheme=prefsfile.iniGetValue('Theme', 'CurrTheme');
   prefsfile.close();
   }
 }
diff --git a/web/root/members/picktheme.ssjs b/web/root/members/picktheme.ssjs
index 80c8ee3f62416f3be280669fa04f47f9a9eac8c5..717c79b1f2056e3b7874415ada47f2c8ce8a4cb7 100644
--- a/web/root/members/picktheme.ssjs
+++ b/web/root/members/picktheme.ssjs
@@ -5,22 +5,24 @@
  * new theme is used here
  */
 
+prefs_dir=system.data_dir + 'user/';
+
 var sub='';
 
 var sq="'";
 var dq='"';
 var pl='+';
-prefsfile=new File(system.data_dir+'user/'+format("%04d.html_prefs",user.number));
+prefsfile=new File(prefs_dir +format("%04d.html_prefs",user.number));
 if(prefsfile.open("r+",false)) {
   ctheme=http_request.query.theme[0];
   ctheme=ctheme.replace(/"/g,dq+pl+sq+dq+sq+pl+dq);   /* "+'"'+" */
-  prefsfile.iniSetValue(null, 'CurrTheme', ctheme);
+  prefsfile.iniSetValue('WebTheme', 'CurrTheme', ctheme);
   prefsfile.close();
 } else {
 if(prefsfile.open("w+",false)) {
   ctheme=http_request.query.theme[0];
   ctheme=ctheme.replace(/"/g,dq+pl+sq+dq+sq+pl+dq);   /* "+'"'+" */
-  prefsfile.iniSetValue(null, 'CurrTheme', ctheme);
+  prefsfile.iniSetValue('WebTheme', 'CurrTheme', ctheme);
   prefsfile.close();
   }
 }