Index: branches/5.2.x/core/units/users/users_config.php
===================================================================
diff -u -N -r14437 -r14447
--- branches/5.2.x/core/units/users/users_config.php	(.../users_config.php)	(revision 14437)
+++ branches/5.2.x/core/units/users/users_config.php	(.../users_config.php)	(revision 14447)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_config.php 14437 2011-07-07 18:00:21Z alex $
+* @version	$Id: users_config.php 14447 2011-07-08 15:43:19Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -334,20 +334,24 @@
 					'Fields' => Array
 							    (
 							        'PortalUserId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
-							        'Login' => Array ('type' => 'string', 'unique'=>Array('Login'), 'default' => null,'required'=>1, 'error_msgs' => Array('unique'=>'!lu_user_already_exist!')),
+							        'Login' => Array (
+							        	'type' => 'string',
+							        	'formatter' => 'kFormatter', 'regexp' => '/^[A-Z\d_\-\.]+$/i',
+							        	'error_msgs' => Array('unique' => '!lu_user_already_exist!', 'invalid_format' => '!la_error_InvalidLogin!'),
+							        	'not_null' => 1, 'unique' => Array (), 'default' => '',
+							        ),
 							        'Password' => Array ('type' => 'string', 'formatter' => 'kPasswordFormatter', 'encryption_method' => 'md5', 'verify_field' => 'VerifyPassword', 'skip_empty' => 1, 'default' => md5('')),
 							        'FirstName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 							        'LastName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''),
 							        'Company' => Array ('type' => 'string','not_null' => 1,'default' => ''),
 							        'Email' => Array (
-							        	'type' => 'string', 'formatter' => 'kFormatter',
-							        	'regexp'=>'/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i',
-							        	'sample_value' => 'email@domain.com', 'unique' => Array ('Email'), 'not_null' => 1,
-							        	'required' => 1,
-							        	'default' => '',
+							        	'type' => 'string',
+							        	'formatter' => 'kFormatter', 'regexp' => '/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i',
+							        	'sample_value' => 'email@domain.com',
 							        	'error_msgs' => Array (
-							        		'invalid_format'=>'!la_invalid_email!', 'unique'=>'!lu_email_already_exist!'
+							        		'invalid_format' => '!la_invalid_email!', 'unique' => '!lu_email_already_exist!'
 							        	),
+							        	'not_null' => 1, 'unique' => Array (), 'required' => 1, 'default' => ''
 							        ),
 							        'CreatedOn' => Array('type'=>'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'),
 							        'Phone' => Array('type' => 'string', 'not_null' => 1, 'default' => ''),
@@ -408,6 +412,11 @@
 										'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %1$s FROM ' . TABLE_PREFIX . 'PortalGroup WHERE Enabled = 1 AND FrontRegistration = 1', 'option_key_field' => 'GroupId', 'option_title_field' => 'Name',
 										'default' => NULL
 									),
+									'OldStyleLogin' => Array (
+										'type' => 'int',
+										'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
+										'not_null' => 1, 'default' => 0
+									),
 							    ),
 
 					'VirtualFields'	=> 	Array(