Index: branches/5.2.x/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r14472 -r14476
--- branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14472)
+++ branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14476)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 14472 2011-07-13 11:42:22Z alex $
+* @version	$Id: users_event_handler.php 14476 2011-08-04 15:17:43Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -353,11 +353,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() );
+				}
 			}
 		}