Index: branches/5.2.x/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r15329 -r15370
--- branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 15329)
+++ branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 15370)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 15329 2012-05-06 12:12:55Z alex $
+* @version	$Id: users_event_handler.php 15370 2012-05-29 13:58:24Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -755,6 +755,7 @@
 				return ;
 			}
 
+			$username_required = $object->isRequired('Username');
 			$this->RemoveRequiredFields($object);
 			$object->Load($user_email, 'Email');
 
@@ -786,8 +787,8 @@
 				$object->generatePassword();
 				$object->SetDBField('Email', $user_email);
 
-				if ( $object->isRequired('Username') )	{
-					$object->SetDBField('Username', $user_email);
+				if ( $username_required )	{
+					$object->SetDBField('Username', str_replace('@', '_at_', $user_email));
 				}
 
 				$object->SetDBField('Status', STATUS_ACTIVE); // make user subscriber Active by default