Index: branches/5.2.x/core/units/configuration/configuration_event_handler.php
===================================================================
diff -u -N -r15437 -r15460
--- branches/5.2.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 15437)
+++ branches/5.2.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 15460)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: configuration_event_handler.php 15437 2012-07-13 14:16:30Z alex $
+* @version	$Id: configuration_event_handler.php 15460 2012-07-18 13:53:01Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -82,17 +82,17 @@
 		}
 
 		/**
-		 * Performs validation of configuration variable value
+		 * Sets custom validation
 		 *
 		 * @param kEvent $event
 		 * @return void
 		 * @access protected
 		 */
-		protected function OnBeforeItemUpdate(kEvent $event)
+		protected function OnAfterItemLoad(kEvent $event)
 		{
 			static $default_field_options = null;
 
-			parent::OnBeforeItemUpdate($event);
+			parent::OnAfterItemLoad($event);
 
 			$object = $event->getObject();
 			/* @var $object kDBItem */
@@ -110,7 +110,22 @@
 			}
 
 			$object->SetFieldOptions('VariableValue', $new_field_options);
+		}
 
+		/**
+		 * Performs validation of configuration variable value
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnBeforeItemUpdate(kEvent $event)
+		{
+			parent::OnBeforeItemUpdate($event);
+
+			$object = $event->getObject();
+			/* @var $object kDBItem */
+
 			// if password field is empty, then don't update
 			if ( $object->GetDBField('ElementType') == 'password' ) {
 				if ( trim($object->GetDBField('VariableValue')) == '' ) {