Index: trunk/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r2489 -r2663
--- trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2489)
+++ trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2663)
@@ -126,11 +126,7 @@
 			$object =& $event->getObject();
 			
 			if( $cs_helper->CountryHasStates( $object->GetDBField('Country') ) ) $object->Fields['State']['required'] = true;
-			
-			if( $this->Application->ConfigValue('Email_As_Login') )
-			{
-				$object->SetDBField('Login', $object->GetDBField('Email') );	
-			}
+			$object->setLogin();
 		}
 		
 		/**
@@ -269,7 +265,7 @@
 			$email_as_login = $this->Application->ConfigValue('Email_As_Login');
 			$object =& $event->getObject();
 			if ($email_as_login) {
-				$object->Fields['Email']['error_msgs']['unique'] =$this->Application->Phrase('lu_user_and_email_already_exist');
+				$object->Fields['Email']['error_msgs']['unique'] = $this->Application->Phrase('lu_user_and_email_already_exist');
 			}
 			
 		}