Index: branches/5.2.x/core/admin_templates/head.tpl
===================================================================
diff -u -N -r16339 -r16471
--- branches/5.2.x/core/admin_templates/head.tpl	(.../head.tpl)	(revision 16339)
+++ branches/5.2.x/core/admin_templates/head.tpl	(.../head.tpl)	(revision 16471)
@@ -110,13 +110,16 @@
 	}
 
 	function change_password() {
-		getFrame('main').set_hidden_field('u_id', <inp2:m_get name="u.current_id" no_html_escape="1" js_escape="1"/>);
+		var $user_id = Number('<inp2:m_get name="u.current_id" no_html_escape="1" js_escape="1"/>');
 
-		<inp2:m_if check="m_GetEquals" name="u.current_id" value="-1">
-			open_popup('u', '', 'users/root_edit_password');
-		<inp2:m_else/>
-			open_popup('u', '', 'users/user_edit_password');
-		</inp2:m_if>
+		if ( $modal_windows ) {
+			getFrame('main').set_hidden_field('u_id', $user_id);
+		}
+		else {
+			set_hidden_field('u_id', $user_id);
+		}
+
+		open_popup('u', '', '<inp2:m_if check="m_GetEquals" name="u.current_id" value="-1">users/root_edit_password<inp2:m_else/>users/user_edit_password</inp2:m_if>');
 	}
 
 	$FrameResizer = new FrameResizer('<inp2:m_Phrase name="la_ToolTip_ShowMenu" js_escape="1"/>', '<inp2:m_Phrase name="la_ToolTip_HideMenu" js_escape="1"/>', window.parent, '<inp2:m_Link pass="m,adm" adm_event="OnSaveSetting" var_name="#NAME#" var_value="#VALUE#" no_amp="1" js_escape="1"/>', <inp2:adm_MenuFrameWidth/>);