Index: branches/unlabeled/unlabeled-1.68.2/core/units/users/users_event_handler.php
===================================================================
diff -u -r6918 -r6922
--- branches/unlabeled/unlabeled-1.68.2/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 6918)
+++ branches/unlabeled/unlabeled-1.68.2/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 6922)
@@ -171,7 +171,6 @@
 						$session->SetField('GroupList', implode(',', $groups) );
 						$this->Application->SetVar('u.current_id', $user_id);
 						$this->Application->StoreVar('user_id', $user_id);
-						$this->Application->setVisitField('PortalUserId', $user_id);
 
 						$this_login = (int)$object->getPersistantVar('ThisLogin');
 						$object->setPersistantVar('LastLogin', $this_login);
@@ -229,7 +228,8 @@
 		 */
 		function processLoginRedirect(&$event, $password)
 		{
-			$object =& $event->getObject();
+			$prefix_special = $this->Application->IsAdmin() ? 'u.current' : 'u'; // "u" used on front not to change theme
+			$object =& $this->Application->recallObject($prefix_special, null, Array('skip_autoload' => true));
 
 			$next_template = $this->Application->GetVar('next_template');
 			if ($next_template == '_ses_redirect') {