Index: branches/5.1.x/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r14445 -r14487
--- branches/5.1.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14445)
+++ branches/5.1.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14487)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 14445 2011-07-08 12:56:13Z alex $
+* @version	$Id: users_event_handler.php 14487 2011-08-13 05:44:20Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1394,7 +1394,10 @@
 				$fields['Country']['options_sql'] = preg_replace('/ORDER BY (.*)/', 'ORDER BY IF (CountryStateId = '.$first_country.', 1, 0) DESC, \\1', $fields['Country']['options_sql']);
 			}
 
+			$max_username = $this->Application->ConfigValue('MaxUserName');
 			$fields['Login']['min_len'] = $this->Application->ConfigValue('Min_UserName');
+			$fields['Login']['max_len'] = $max_username ? $max_username : 255;
+
 			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
 
 			// 2. set default user registration group