Index: branches/5.2.x/core/units/helpers/user_helper.php
===================================================================
diff -u -N -r14631 -r14726
--- branches/5.2.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 14631)
+++ branches/5.2.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 14726)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_helper.php 14631 2011-10-04 14:23:45Z alex $
+* @version	$Id: user_helper.php 14726 2011-11-03 08:43:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -69,7 +69,7 @@
 
 				$user_id = USER_ROOT;
 				$object->Clear($user_id);
-				$object->SetDBField('Login', 'root');
+				$object->SetDBField('Username', 'root');
 
 				if (!$dry_run) {
 					$this->loginUserById($user_id, $remember_login_cookie);
@@ -146,7 +146,7 @@
 		}
 
 		/**
-		 * Login username by it's PortalUserId
+		 * Login user by it's id
 		 *
 		 * @param int $user_id
 		 * @param bool $remember_login_cookie
@@ -323,7 +323,7 @@
 
 			$sql = 'SELECT PortalUserId
 					FROM ' . TABLE_PREFIX . 'PortalUser
-					WHERE (Email = %1$s OR Login = %1$s) AND (Password = %2$s)';
+					WHERE (Email = %1$s OR Username = %1$s) AND (Password = %2$s)';
 			return $this->Conn->GetOne( sprintf($sql, $this->Conn->qstr($username), $this->Conn->qstr($password) ) );
 		}