Index: branches/5.2.x/core/admin_templates/config/config_general.tpl
===================================================================
diff -u -N -r14637 -r14965
--- branches/5.2.x/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 14637)
+++ branches/5.2.x/core/admin_templates/config/config_general.tpl	(.../config_general.tpl)	(revision 14965)
@@ -5,79 +5,94 @@
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
-<tbody>
-	<tr>
-  	<td>
-  		<script type="text/javascript">
+	<tbody>
+		<tr>
+  			<td>
+  				<script type="text/javascript">
+					function validate_password_fields() {
+						var $validated = true;
 
-  			function ValidatePassFld(fieldId){
-  				var passFld=document.getElementById(fieldId);
-  				var passVerifyFld=document.getElementById('verify_'+fieldId);
-  				if (passFld && passVerifyFld && passFld.value == passVerifyFld.value) {
-  					return true;
-  				}
-  				else {
-  					var passErrorCell=document.getElementById('error_'+fieldId);
-  					if (passErrorCell){
-  						passErrorCell.innerHTML='<inp2:m_phrase name="la_error_PasswordMatch" />';
-  					}
-  					return false;
-  				}
-  			}
+						$("input[primarytype='password']", '#' + $form_name).each(
+							function ($e) {
+								if ( !validate_password_field(this.id) ) {
+									$validated = false;
+								}
+							}
+						);
 
-  			function ValidatePassFields(){
-  				var el=false;
-  				var validated=true;
-  				for (var i=0; i<document.forms.kernel_form.elements.length; i++){
-  					el=document.forms.kernel_form.elements[i];
-  					if (el.getAttribute('primarytype')=='password'){
-  						if (!ValidatePassFld(el.id)){
-  							validated=false;
-  						}
-  					}
-  				}
-  				return validated;
-  			}
+						return $validated;
+					}
 
-  			function toggle_section($label) {
-  				var $table = document.getElementById('config_table');
-  				var $row = null;
-  				var $is_visible = false;
+					function validate_password_field($field_id) {
+						var password_field = document.getElementById($field_id),
+							password_verify_field = document.getElementById('verify_' + $field_id);
 
-  				for (var $i = 0; $i < $table.rows.length; $i++) {
-  					$row = $table.rows[$i];
-  					if ($row.getAttribute('header_label') != $label) {
-  						continue;
-  					}
+						if ( password_field && password_verify_field && password_field.value == password_verify_field.value ) {
+							return true;
+						}
+						else {
+							var password_error_cell = document.getElementById('error_' + $field_id);
 
-  					if (!$row.style.display) {
-  						$row.style.display = document.all ? 'block' : 'table-row';
-  					}
+							if ( password_error_cell ) {
+								$(window).scrollTop($(password_field).position().top - 15);
+								password_error_cell.innerHTML = '<inp2:m_Phrase name="la_error_PasswordMatch"/>';
+							}
 
-  					$is_visible = !($row.style.display == 'none');
-  					$row.style.display = $is_visible ?  'none' : (document.all ? 'block' : 'table-row');
+							return false;
+						}
+					}
 
-  					document.getElementById('toggle_mark['+$label+']').innerHTML = '[' + ($is_visible ? '+' : '-') + ']';
-  				}
-  			}
+					function toggle_section($label) {
+						var $table = document.getElementById('config_table');
+						var $row = null;
+						var $is_visible = false;
 
-  			var a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							if (ValidatePassFields()){
-								submit_event('conf','<inp2:conf_SaveEvent/>');
+						for (var $i = 0; $i < $table.rows.length; $i++) {
+							$row = $table.rows[$i];
+							if ( $row.getAttribute('header_label') != $label ) {
+								continue;
 							}
+
+							if ( !$row.style.display ) {
+								$row.style.display = document.all ? 'block' : 'table-row';
+							}
+
+							$is_visible = !($row.style.display == 'none');
+							$row.style.display = $is_visible ? 'none' : (document.all ? 'block' : 'table-row');
+
+							document.getElementById('toggle_mark[' + $label + ']').innerHTML = '[' + ($is_visible ? '+' : '-') + ']';
 						}
-					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('conf','OnCancel');
-						}
-				 ) );
+					}
 
-				a_toolbar.Render();
-			</script>
-		</td>
-	</tr>
-</tbody>
+  					var a_toolbar = new ToolBar();
+
+					a_toolbar.AddButton(
+						new ToolBarButton(
+							'select',
+							'<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>',
+							function() {
+								submit_event('conf','<inp2:conf_SaveEvent/>');
+							}
+						)
+					);
+
+					a_toolbar.AddButton(
+						new ToolBarButton(
+							'cancel',
+							'<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>',
+							function() {
+								submit_event('conf','OnCancel');
+							}
+					 	)
+					);
+
+					<inp2:m_ModuleInclude template = "config/custom_toolbar"/>
+
+					a_toolbar.Render();
+				</script>
+			</td>
+		</tr>
+	</tbody>
 </table>
 
 <inp2:m_include t="incs/config_blocks"/>
@@ -129,6 +144,13 @@
 
 		$menu_frame.parent.location.href = $menu_frame.parent.location.href;
 	</inp2:m_if>
+
+	Application.setHook(
+		'conf:*',
+		function ($event) {
+			$event.status = $event.Name == 'OnCancel' ? true : validate_password_fields();
+		}
+	);
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file