Index: branches/5.3.x/core/units/configuration/configuration_event_handler.php
===================================================================
diff -u -N -r15483 -r15677
--- branches/5.3.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 15483)
+++ branches/5.3.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 15677)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: configuration_event_handler.php 15471 2012-07-23 17:10:50Z alex $
+* @version	$Id: configuration_event_handler.php 15677 2013-01-17 18:52:50Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -150,7 +150,7 @@
 					$password_formatter = $this->Application->recallObject('kPasswordFormatter');
 					/* @var $password_formatter kPasswordFormatter */
 
-					$object->SetDBField('VariableValue', $password_formatter->EncryptPassword($object->GetDBField('VariableValue'), 'b38'));
+					$object->SetDBField('VariableValue', $password_formatter->hashPassword($object->GetDBField('VariableValue')));
 				}
 			}
 
@@ -175,7 +175,7 @@
 				}
 			}
 			elseif ( $variable_name == 'DefaultEmailRecipients' ) {
-				$email_event_data = $this->Application->GetVar('emailevents_' . $event->Prefix);
+				$email_event_data = $this->Application->GetVar('email-template_' . $event->Prefix);
 				$object->SetDBField('VariableValue', $email_event_data[0]['Recipients']);
 			}
 
@@ -320,8 +320,6 @@
 					$skin_deleted = true;
 				}
 			}
-
-			$this->Application->StoreVar('config_was_updated', 1);
 		}
 
 		/**
@@ -367,6 +365,8 @@
 			}
 
 			if ( $event->status == kEvent::erSUCCESS ) {
+				$event->SetRedirectParam('action_completed', 1);
+
 				if ( $new_category_id !== false ) {
 					// root category was submitted
 					$module = $this->Application->GetVar('module');
@@ -400,9 +400,14 @@
 
 				$this->Application->DeleteUnitCache($changed);
 			}
-			elseif ( $this->Application->GetVar('errors_' . $event->getPrefixSpecial()) ) {
-				// because we have list out there, and this is item
-				$this->Application->removeObject($event->getPrefixSpecial());
+			else{
+				$errors = $this->Application->GetVar('errors_' . $event->getPrefixSpecial());
+
+				if ( $errors ) {
+					// because we have list out there, and this is item
+					$this->Application->SetVar('first_error', key($errors));
+					$this->Application->removeObject($event->getPrefixSpecial());
+				}
 			}
 
 			// keeps module and section in REQUEST to ensure, that last admin template will work
@@ -524,7 +529,7 @@
 				$suggestion_module = in_array('In-Portal', $suggestion_modules) ? 'In-Portal' : implode(', ', $suggestion_modules);
 				$suggestion_title = $suggestion_value . ' <em style="color: grey;">' . $of_label . ' ' . $suggestion_module . '</em>';
 
-				echo '<item value="' . htmlspecialchars($suggestion_value) . '">' . htmlspecialchars($suggestion_title) . '</item>';
+				echo '<item value="' . htmlspecialchars($suggestion_value, null, CHARSET) . '">' . htmlspecialchars($suggestion_title, null, CHARSET) . '</item>';
 			}
 
 			echo '</suggestions>';