Index: branches/5.2.x/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r14719 -r14726
--- branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14719)
+++ branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14726)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 14719 2011-11-01 16:12:02Z alex $
+* @version	$Id: users_event_handler.php 14726 2011-11-03 08:43:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -482,7 +482,7 @@
 			/* @var $user_helper UserHelper */
 
 			if ( !$user_helper->checkBanRules($object) ) {
-				$object->SetError('Login', 'banned');
+				$object->SetError('Username', 'banned');
 			}
 
 			$object->SetDBField('IPAddress', $_SERVER['REMOTE_ADDR']);
@@ -718,8 +718,8 @@
 				$object->generatePassword();
 				$object->SetDBField('Email', $user_email);
 
-				if ( $object->isRequired('Login') )	{
-					$object->SetDBField('Login', $user_email);
+				if ( $object->isRequired('Username') )	{
+					$object->SetDBField('Username', $user_email);
 				}
 
 				$object->SetDBField('Status', STATUS_ACTIVE); // make user subscriber Active by default
@@ -789,7 +789,7 @@
 			$email = $object->GetDBField('ForgotEmail');
 
 			if ( strlen($username) ) {
-				$user_object->Load($username, 'Login');
+				$user_object->Load($username, 'Username');
 			}
 			elseif ( strlen($email) ) {
 				$user_object->Load($email, 'Email');
@@ -1422,8 +1422,8 @@
 			}
 
 			$max_username = $this->Application->ConfigValue('MaxUserName');
-			$fields['Login']['min_len'] = $this->Application->ConfigValue('Min_UserName');
-			$fields['Login']['max_len'] = $max_username ? $max_username : 255;
+			$fields['Username']['min_len'] = $this->Application->ConfigValue('Min_UserName');
+			$fields['Username']['max_len'] = $max_username ? $max_username : 255;
 
 			// 2. set default user registration group
 			$form_fields['PrimaryGroupId']['default'] = $this->Application->ConfigValue('User_NewGroup');
@@ -1458,8 +1458,8 @@
 			}
 
 			if ( !$this->Application->ConfigValue('Email_As_Login') ) {
-				// Login becomes required only, when it's used in registration process
-				$form_fields['Login']['required'] = 1;
+				// Username becomes required only, when it's used in registration process
+				$form_fields['Username']['required'] = 1;
 			}
 
 			$this->Application->setUnitOption($event->Prefix, 'Forms', $forms);