Index: branches/5.2.x/core/kernel/kbase.php
===================================================================
diff -u -N -r14596 -r14599
--- branches/5.2.x/core/kernel/kbase.php	(.../kbase.php)	(revision 14596)
+++ branches/5.2.x/core/kernel/kbase.php	(.../kbase.php)	(revision 14599)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: kbase.php 14596 2011-09-29 15:46:43Z alex $
+* @version	$Id: kbase.php 14599 2011-09-29 19:58:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -775,8 +775,11 @@
 	{
 		$field_options = $this->GetFieldOptions($field, $is_virtual);
 
-		if (!$field_options) {
-			return $field_options;
+		if ( !$field_options ) {
+			$form_name = $this->getFormName();
+			trigger_error('Field "<strong>' . $field . '</strong>" is not defined' . ($form_name ? ' on "<strong>' . $this->getFormName() . '</strong>" form' : '') . ' in "<strong>' . $this->Prefix . '</strong>" unit config', E_USER_WARNING);
+
+			return false;
 		}
 
 		return array_key_exists($option_name, $field_options) ? $field_options[$option_name] : $default;
Index: branches/5.2.x/admin/system_presets/simple/users_u.php
===================================================================
diff -u -N -r14585 -r14599
--- branches/5.2.x/admin/system_presets/simple/users_u.php	(.../users_u.php)	(revision 14585)
+++ branches/5.2.x/admin/system_presets/simple/users_u.php	(.../users_u.php)	(revision 14599)
@@ -76,7 +76,7 @@
 
 	// virtual fields to hide
 	$virtual_hidden_fields = Array (
-		/*'ValidateLogin', 'SubscribeEmail', 'PrimaryGroup', 'RootPassword', 'FullName', 'UserGroup'*/
+		/*'SubscribeEmail', 'PrimaryGroup', 'RootPassword', 'FullName', 'UserGroup'*/
 	);
 
 	// fields to make required
@@ -88,7 +88,7 @@
 
 	// virtual fields to make required
 	$virtual_required_fields = Array (
-		/*'ValidateLogin', 'SubscribeEmail', 'PrimaryGroup', 'RootPassword', 'FullName', 'UserGroup'*/
+		/*'SubscribeEmail', 'PrimaryGroup', 'RootPassword', 'FullName', 'UserGroup'*/
 	);
 
 	// tabs during editing
Index: branches/5.2.x/core/kernel/application.php
===================================================================
diff -u -N -r14596 -r14599
--- branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 14596)
+++ branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 14599)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 14596 2011-09-29 15:46:43Z alex $
+* @version	$Id: application.php 14599 2011-09-29 19:58:55Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1642,10 +1642,10 @@
 
 		if ( $this->GetVar('expired') == 1 ) {
 			// this parameter is set only from admin
-			$user =& $this->recallObject('u.current');
+			$user =& $this->recallObject('u.login-admin', null, Array ('form_name' => 'login'));
 			/* @var $user UsersItem */
 
-			$user->SetError('ValidateLogin', 'session_expired', 'la_text_sess_expired');
+			$user->SetError('UserLogin', 'session_expired', 'la_text_sess_expired');
 		}
 
 		if ( ($user_id != USER_GUEST) && defined('DBG_REQUREST_LOG') && DBG_REQUREST_LOG ) {