Index: units/users/users_event_handler.php
===================================================================
--- units/users/users_event_handler.php	(revision 14318)
+++ units/users/users_event_handler.php	(working copy)
@@ -351,11 +351,13 @@
 			$object =& $event->getObject();
 			$this->Application->SetVar('u.current_id', $object->GetID());
 
-			if ($object->GetDBField('Status') == STATUS_ACTIVE && !$this->Application->ConfigValue('User_Password_Auto')) {
+			if ( $object->GetDBField('Status') == STATUS_ACTIVE ) {
 				$user_helper =& $this->Application->recallObject('UserHelper');
 				/* @var $user_helper UserHelper */
 
-				$user_helper->loginUser($object->GetDBField('Login'), $object->GetDBField('Password_plain'));
+				if ( $user_helper->checkLoginPermission() ) {
+					$user_helper->loginUserById( $object->GetID() );
+				}
 			}
 		}