Index: trunk/kernel/include/usersession.php
===================================================================
diff -u -N -r2228 -r2299
--- trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 2228)
+++ trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 2299)
@@ -26,7 +26,7 @@
 	
 	function clsUserSession($id=NULL, $TempKeys=FALSE)
     {
-        global $objConfig, $objLanguages, $objThemes, $m_var_list;
+        global $objConfig, $objLanguages, $objThemes, $m_var_list, $FrontEnd;
 
         $this->m_Errors = new clsErrorManager();
         $this->adodbConnection = &GetADODBConnection();
@@ -58,7 +58,9 @@
             	//$this->Set("Theme", $objConfig->Get("Default_Theme"));
 				$this->Set("GroupList",0);
             	$this->Set("SessionKey","");
-            	$this->Set("GroupList",$objConfig->Get("User_GuestGroup").','.$objConfig->Get('User_LoggedInGroup') );
+            	if ($FrontEnd) {
+            		$this->Set("GroupList",$objConfig->Get("User_GuestGroup").','.$objConfig->Get('User_LoggedInGroup') );
+            	}
         	}
         }
         else
@@ -488,7 +490,7 @@
 		}
 		
 		if($PrimaryGroup) array_unshift($GroupList, $PrimaryGroup);
-		array_push($GroupList, $objConfig->Get('User_LoggedInGroup') );
+		if ($FrontEnd) array_push($GroupList, $objConfig->Get('User_LoggedInGroup') );
 		
         $extra_groups = implode(',', $GroupList);
         
@@ -529,14 +531,14 @@
 
 	function Logout()
     {
-        global $objConfig;
+        global $objConfig, $FrontEnd;
 
        	$this->Set("PortalUserId", 0);	// not logged-in
        	$this->Set('LastAccessed',0);	// session become expired
        	$this->Set("GroupId", $objConfig->Get("User_GuestGroup"));
 		#$this->SetPersistantVariable("LastLogin", time());       
         
-        $group_list = $objConfig->Get('User_GuestGroup').','.$objConfig->Get('User_LoggedInGroup');
+        if ($FrontEnd) $group_list = $objConfig->Get('User_GuestGroup').','.$objConfig->Get('User_LoggedInGroup');
         $this->Set("GroupList", $group_list);
         $this->SetVariable('UserGroups', $group_list );
 
Index: trunk/core/units/general/inp_ses_storage.php
===================================================================
diff -u -N -r2223 -r2299
--- trunk/core/units/general/inp_ses_storage.php	(.../inp_ses_storage.php)	(revision 2223)
+++ trunk/core/units/general/inp_ses_storage.php	(.../inp_ses_storage.php)	(revision 2299)
@@ -28,8 +28,10 @@
 			$this->SetCookieDomain( SERVER_NAME );
 			parent::Init($prefix,$special);
 			
-			$group_list = $this->Application->ConfigValue('User_GuestGroup').','.$this->Application->ConfigValue('User_LoggedInGroup');
-			$this->SetField('GroupList', $group_list);
+			if (!defined('ADMIN')) {
+				$group_list = $this->Application->ConfigValue('User_GuestGroup').','.$this->Application->ConfigValue('User_LoggedInGroup');
+				$this->SetField('GroupList', $group_list);
+			}
 		}
 	}
 
Index: trunk/kernel/units/users/users_event_handler.php
===================================================================
diff -u -N -r2292 -r2299
--- trunk/kernel/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2292)
+++ trunk/kernel/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2299)
@@ -41,7 +41,7 @@
 					
 					$groups = $this->Conn->GetCol($sql);
 					if(!$groups) $groups = Array();
-					array_push($groups, $this->Application->ConfigValue('User_LoggedInGroup') );
+					if (!defined('ADMIN')) array_push($groups, $this->Application->ConfigValue('User_LoggedInGroup') );
 					$this->Application->StoreVar( 'UserGroups', implode(',', $groups) );
 					
 					if( $this->Application->CheckPermission('LOGIN',0) )
Index: trunk/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r2292 -r2299
--- trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2292)
+++ trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2299)
@@ -41,7 +41,7 @@
 					
 					$groups = $this->Conn->GetCol($sql);
 					if(!$groups) $groups = Array();
-					array_push($groups, $this->Application->ConfigValue('User_LoggedInGroup') );
+					if (!defined('ADMIN')) array_push($groups, $this->Application->ConfigValue('User_LoggedInGroup') );
 					$this->Application->StoreVar( 'UserGroups', implode(',', $groups) );
 					
 					if( $this->Application->CheckPermission('LOGIN',0) )
Index: trunk/kernel/units/general/inp_ses_storage.php
===================================================================
diff -u -N -r2223 -r2299
--- trunk/kernel/units/general/inp_ses_storage.php	(.../inp_ses_storage.php)	(revision 2223)
+++ trunk/kernel/units/general/inp_ses_storage.php	(.../inp_ses_storage.php)	(revision 2299)
@@ -28,8 +28,10 @@
 			$this->SetCookieDomain( SERVER_NAME );
 			parent::Init($prefix,$special);
 			
-			$group_list = $this->Application->ConfigValue('User_GuestGroup').','.$this->Application->ConfigValue('User_LoggedInGroup');
-			$this->SetField('GroupList', $group_list);
+			if (!defined('ADMIN')) {
+				$group_list = $this->Application->ConfigValue('User_GuestGroup').','.$this->Application->ConfigValue('User_LoggedInGroup');
+				$this->SetField('GroupList', $group_list);
+			}
 		}
 	}