Index: branches/5.2.x/core/admin_templates/incs/config_blocks.tpl
===================================================================
diff -u -N -r15471 -r15525
--- branches/5.2.x/core/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 15471)
+++ branches/5.2.x/core/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 15525)
@@ -89,7 +89,7 @@
 			<inp2:m_RenderElement name="$value_render_as" pass_params="1"/>
 		</td>
 
-		<td class="error"><inp2:Error id_field="VariableName"/>&nbsp;</td>
+		<td class="field-<inp2:Field name='VariableName'/> error"><inp2:Error id_field="VariableName"/>&nbsp;</td>
 	</tr>
 </inp2:m_DefineElement>
 
@@ -116,17 +116,16 @@
 <inp2:m_DefineElement name="config_block2">
 			<inp2:m_RenderElement name="$value_render_as" pass_params="1"/></nobr>
 		</td>
-		<td class="error"><inp2:Error id_field="VariableName"/>&nbsp;</td>
+		<td class="field-<inp2:Field name='VariableName'/> error"><inp2:Error id_field="VariableName"/>&nbsp;</td>
 	</tr>
 </inp2:m_DefineElement>
 
 <inp2:m_ModuleInclude template="config/custom_variables"/>
 
 <inp2:m_DefineElement name="config_updated_notice">
-	<inp2:m_if check="m_Recall" var="config_was_updated">
+	<inp2:m_if check="m_Get" var="action_completed">
 		<inp2:m_RenderElement design="form_message" type="notice">
 			<inp2:m_Phrase name="la_msg_YourChangesWereSuccessfullySaved"/><br/>
 		</inp2:m_RenderElement>
-		<inp2:m_RemoveVar name="config_was_updated" />
 	</inp2:m_if>
 </inp2:m_DefineElement>
Index: branches/5.2.x/core/admin_templates/config/config_general.tpl
===================================================================
diff -u -N -r15471 -r15525
--- branches/5.2.x/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 15471)
+++ branches/5.2.x/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 15525)
@@ -165,6 +165,16 @@
 			$event.status = $event.Name == 'OnCancel' ? true : validate_password_fields();
 		}
 	);
+
+	<inp2:m_if check="m_Get" name="first_error">
+		$(document).ready(function () {
+			var $error_cell = $('.field-<inp2:m_Get name="first_error"/>.error');
+
+			if ( $error_cell.length ) {
+				$(window).scrollTop($error_cell.position().top - 15);
+			}
+		});
+	</inp2:m_if>
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.2.x/core/admin_templates/config/config_universal.tpl
===================================================================
diff -u -N -r15471 -r15525
--- branches/5.2.x/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 15471)
+++ branches/5.2.x/core/admin_templates/config/config_universal.tpl	(.../config_universal.tpl)	(revision 15525)
@@ -136,6 +136,16 @@
 			$event.status = $event.Name == 'OnCancel' ? true : validate_password_fields();
 		}
 	);
+
+	<inp2:m_if check="m_Get" name="first_error">
+		$(document).ready(function () {
+			var $error_cell = $('.field-<inp2:m_Get name="first_error"/>.error');
+
+			if ( $error_cell.length ) {
+				$(window).scrollTop($error_cell.position().top - 15);
+			}
+		});
+	</inp2:m_if>
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.2.x/core/units/configuration/configuration_event_handler.php
===================================================================
diff -u -N -r15471 -r15525
--- branches/5.2.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 15471)
+++ branches/5.2.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 15525)
@@ -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 15525 2012-08-20 17:20:38Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -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