diff --git a/class2.php b/class2.php
index ca0bf54aa..12a111c1f 100644
--- a/class2.php
+++ b/class2.php
@@ -798,13 +798,17 @@ if(isset($pref['e_module_list']) && $pref['e_module_list'])
 }
 
 
-
 //
 // P: THEME LOADING
 //
 
 $sql->db_Mark_Time('Load Theme');
 
+if(!defined("USERTHEME"	))
+{
+	define('USERTHEME', (e107::getUser()->getPref('sitetheme') && file_exists(e_THEME.e107::getUser()->getPref('sitetheme')."/theme.php") ? e107::getUser()->getPref('sitetheme') : false));
+}
+
 //###########  Module redefinable functions ###############
 if (!function_exists('checkvalidtheme'))
 {
@@ -1813,6 +1817,8 @@ function init_session()
 				$uconfig->save(true);
 				unset($ut);
 			}
+
+
    		}
    		elseif ($user->getPref('sitetheme'))
    		{
@@ -1822,12 +1828,10 @@ function init_session()
    				->remove('sitetheme_deflayout')
    				->save(false);
 		}
-		// XXX could go to e_user class as well END
-		if(!defined("USERTHEME"	))
-		{
-			define('USERTHEME', ($user->getPref('sitetheme') && file_exists(e_THEME.$user->getPref('sitetheme')."/theme.php") ? $user->getPref('sitetheme') : false));				
-		}
-		
+
+
+
+
 		$user_pref = $user->getPref();
 	}