Index: branches/5.1.x/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r14241 -r14341
--- branches/5.1.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14241)
+++ branches/5.1.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14341)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 14241 2011-03-16 20:24:35Z alex $
+* @version	$Id: users_event_handler.php 14341 2011-05-23 07:47:23Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1380,13 +1380,16 @@
 				$first_country = $this->Application->ConfigValue('User_Default_Registration_Country');
 			}
 
+			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
+
 			if ($first_country) {
 				// update user country dropdown sql
-				$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
 				$fields['Country']['options_sql'] = preg_replace('/ORDER BY (.*)/', 'ORDER BY IF (CountryStateId = '.$first_country.', 1, 0) DESC, \\1', $fields['Country']['options_sql']);
-				$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
 			}
 
+			$fields['Login']['min_len'] = $this->Application->ConfigValue('Min_UserName');
+			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+
 			// 2. set default user registration group
 			$virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields');
 			$virtual_fields['UserGroup']['default'] = $this->Application->ConfigValue('User_NewGroup');