Index: branches/5.3.x/core/units/configuration/configuration_event_handler.php
===================================================================
diff -u -N -r15677 -r15698
--- branches/5.3.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 15677)
+++ branches/5.3.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 15698)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: configuration_event_handler.php 15677 2013-01-17 18:52:50Z alex $
+* @version	$Id: configuration_event_handler.php 15698 2013-02-19 11:33:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -247,15 +247,15 @@
 			$field_values = $this->Application->GetVar($event->getPrefixSpecial(true));
 
 			$sql = 'SELECT VariableId
-					FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
+					FROM ' . $event->getUnitConfig()->getTableName() . '
 					WHERE VariableName = ' . $this->Conn->qstr($state_country_hash[$variable_name]);
 			$country_variable_id = $this->Conn->GetOne($sql);
 
 			return $field_values[$country_variable_id]['VariableValue'];
 		}
 
 		/**
-		 * Does custom password setting processong
+		 * Does custom password setting processing
 		 *
 		 * @param kEvent $event
 		 * @return void
@@ -502,7 +502,7 @@
 			}
 
 			$sql = 'SELECT DISTINCT ' . $field . ', ModuleOwner
-					FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
+					FROM ' . $event->getUnitConfig()->getTableName() . '
 					WHERE ' . $field . ' LIKE ' . $this->Conn->qstr('%' . $cur_value . '%') . '
 					ORDER BY ' . $field . ' ASC';
 			$raw_suggestions = $this->Conn->Query($sql);
@@ -560,8 +560,10 @@
 				}
 			}
 
-			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
+			$config = $event->getUnitConfig();
+
+			$fields = $config->getFields();
 			$fields['ModuleOwner']['options'] = $options;
-			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
+			$config->setFields($fields);
 		}
 	}
\ No newline at end of file