Index: branches/5.2.x/admin/system_presets/simple/users_u.php
===================================================================
diff -u -N -r14663 -r14726
--- branches/5.2.x/admin/system_presets/simple/users_u.php	(.../users_u.php)	(revision 14663)
+++ branches/5.2.x/admin/system_presets/simple/users_u.php	(.../users_u.php)	(revision 14726)
@@ -69,7 +69,7 @@
 
 	// fields to hide
 	$hidden_fields = Array (
-		/* 'PortalUserId', 'Login', 'Password', 'FirstName','LastName', 'Company', 'Email', 'CreatedOn',
+		/* 'PortalUserId', 'Username', 'Password', 'FirstName','LastName', 'Company', 'Email', 'CreatedOn',
 		'Phone', 'Fax', 'Street', 'Street2', 'City', 'State' , 'Zip', 'Country', 'ResourceId', 'Status',
 		'Modified', 'dob', 'tz',*/ 'IPAddress', /*'IsBanned', 'PwResetConfirm', 'PwRequestTime',*/ 'IPRestrictions',
 	);
@@ -81,7 +81,7 @@
 
 	// fields to make required
 	$required_fields = Array (
-		/*'PortalUserId',*/ 'Login', /*'Password', 'FirstName', 'LastName', 'Company', */'Email', /*'CreatedOn',
+		/*'PortalUserId',*/ 'Username', /*'Password', 'FirstName', 'LastName', 'Company', */'Email', /*'CreatedOn',
 		'Phone', 'Fax', 'Street', 'Street2', 'City', 'State' , 'Zip', 'Country', 'ResourceId', 'Status',
 		'Modified', 'dob', 'tz', 'IPAddress', 'IsBanned', 'PwResetConfirm', 'PwRequestTime',*/
 	);
@@ -106,14 +106,14 @@
 	// hide columns in grids
 	$hide_columns = Array (
 //		currently not in user
-//		'Default'	=>	Array ('Login', 'LastName', 'FirstName', 'Email', 'PrimaryGroup', 'CreatedOn', 'Modified'),
+//		'Default'	=>	Array ('Username', 'LastName', 'FirstName', 'Email', 'PrimaryGroup', 'CreatedOn', 'Modified'),
 
 //		user selector
-//		'UserSelector' => Array ('Login', 'LastName', 'FirstName', 'Email', 'PrimaryGroup', 'CreatedOn', 'Modified'),
+//		'UserSelector' => Array ('Username', 'LastName', 'FirstName', 'Email', 'PrimaryGroup', 'CreatedOn', 'Modified'),
 
 //		admins list; section: Users Management -> Administrators
-//		'Admins' => Array ('PortalUserId', 'Login', 'FirstName', 'LastName', 'Email'),
+//		'Admins' => Array ('PortalUserId', 'Username', 'FirstName', 'LastName', 'Email'),
 
 //		users list; section: Users Management -> Users
-		'RegularUsers' => Array (/*'PortalUserId', 'Login', 'FirstName', 'LastName', 'Email',*/ 'PrimaryGroup', 'CreatedOn', 'Modified', /* 'Status',*/ 'IPAddress'),
+		'RegularUsers' => Array (/*'PortalUserId', 'Username', 'FirstName', 'LastName', 'Email',*/ 'PrimaryGroup', 'CreatedOn', 'Modified', /* 'Status',*/ 'IPAddress'),
 	);