Index: trunk/kernel/include/usersession.php
===================================================================
diff -u -N -r2082 -r2223
--- trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 2082)
+++ trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 2223)
@@ -58,7 +58,7 @@
             	//$this->Set("Theme", $objConfig->Get("Default_Theme"));
 				$this->Set("GroupList",0);
             	$this->Set("SessionKey","");
-            	$this->Set("GroupList",$objConfig->Get("User_GuestGroup"));
+            	$this->Set("GroupList",$objConfig->Get("User_GuestGroup").','.$objConfig->Get('User_LoggedInGroup') );
         	}
         }
         else
@@ -496,7 +496,15 @@
         
         $this->Set('GroupId', $PersonalGroup ? $PersonalGroup : $PrimaryGroup);
         
+        $app = kApplication::Instance();
+        $kSession = $app->recallObject('Session');
+        
         $this->Set('GroupList', $extra_groups);
+        $this->SetVariable('UserGroups', $this->Get('GroupList') );
+
+        $kSession->SetField('GroupList',  $extra_groups);  
+       	$app->StoreVar('UserGroups', $this->Get('GroupList') );
+        
 		$this->Set('LastAccessed', date('U') );
 		$this_login = $this->GetPersistantVariable("ThisLogin");
 		$this->SetPersistantVariable("LastLogin", $this_login);
@@ -525,7 +533,17 @@
        	$this->Set('LastAccessed',0);	// session become expired
        	$this->Set("GroupId", $objConfig->Get("User_GuestGroup"));
 		#$this->SetPersistantVariable("LastLogin", time());       
-        $this->Set("GroupList",$objConfig->Get("User_GuestGroup"));
+        
+        $app = kApplication::Instance();
+        $kSession = $app->recallObject('Session');
+        
+        $group_list = $objConfig->Get('User_GuestGroup').','.$objConfig->Get('User_LoggedInGroup');
+        $this->Set("GroupList", $group_list);
+        $this->SetVariable('UserGroups', $group_list );
+
+        $kSession->SetField('GroupList',  $group_list);  
+       	$app->StoreVar('UserGroups', $group_list );
+        
         $this->Set("IpAddress",$_SERVER['REMOTE_ADDR']);
         
         $this->DeleteSessionData($this->GetSessionKey());