Index: branches/5.2.x/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r14726 -r14728
--- branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14726)
+++ branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14728)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 14726 2011-11-03 08:43:30Z alex $
+* @version	$Id: users_event_handler.php 14728 2011-11-03 10:44:15Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -470,12 +470,6 @@
 
 			$cs_helper->PopulateStates($event, 'State', 'Country');
 
-			if ( $this->Application->ConfigValue('Email_As_Login') ) {
-				$error_msgs = $object->GetFieldOption('Email', 'error_msgs');
-				$error_msgs['unique'] = '!lu_user_and_email_already_exist!';
-				$object->SetFieldOption('Email', 'error_msgs', $error_msgs);
-			}
-
 			$this->setUserGroup($object);
 
 			$user_helper =& $this->Application->recallObject('UserHelper');
@@ -1457,7 +1451,7 @@
 				}
 			}
 
-			if ( !$this->Application->ConfigValue('Email_As_Login') ) {
+			if ( $this->Application->ConfigValue('RegistrationUsernameRequired') ) {
 				// Username becomes required only, when it's used in registration process
 				$form_fields['Username']['required'] = 1;
 			}