Index: trunk/core/units/users/users_event_handler.php
===================================================================
diff -u -r1835 -r1868
--- trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 1835)
+++ trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 1868)
@@ -24,9 +24,12 @@
 			$email_as_login = $this->Application->ConfigValue('Email_As_Login');
 			list($login_field, $submit_field) = $email_as_login ? Array('Email', 'email') : Array('Login', 'login');
 			$login_value = $this->Application->GetVar($submit_field);
+
+			/*$sql = 'SELECT PortalUserId FROM '.$object->TableName.' WHERE (%s = %s) AND (Password = MD5(%s))';
+			$user_id = $this->Conn->GetOne( sprintf($sql, $login_field, $this->Conn->qstr($login_value), $this->Conn->qstr($password) ) );*/
 			
-			$sql = 'SELECT PortalUserId FROM '.$object->TableName.' WHERE (%s = %s) AND (Password = MD5(%s))';
-			$user_id = $this->Conn->GetOne( sprintf($sql, $login_field, $this->Conn->qstr($login_value), $this->Conn->qstr($password) ) );
+			$sql = 'SELECT PortalUserId FROM '.$object->TableName.' WHERE (Email = %1$s OR Login = %1$s) AND (Password = MD5(%2$s))';
+			$user_id = $this->Conn->GetOne( sprintf($sql, $this->Conn->qstr($login_value), $this->Conn->qstr($password) ) );
 			
 			if($user_id)
 			{