Index: branches/RC/core/admin_templates/users/admins_edit.tpl
===================================================================
diff -u -r11139 -r11140
--- branches/RC/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 11139)
+++ branches/RC/core/admin_templates/users/admins_edit.tpl	(.../admins_edit.tpl)	(revision 11140)
@@ -1,11 +1,8 @@
 <inp2:adm_SetPopupSize width="550" height="400"/>
 <inp2:m_include t="incs/header"/>
-<inp2:m_if check="m_ConfigEquals" name="AdvancedUserManagement" value="1">
-	<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="admins_edit" tabs="users/admins_edit_tabs"/>
-<inp2:m_else/>
-	<inp2:m_RenderElement name="combined_header" section="proj-base:admins" pagination="0" prefix="u" title_preset="admins_edit"/>
-</inp2:m_if>
 
+<inp2:m_RenderElement name="combined_header" section="proj-base:admins" prefix="u" title_preset="admins_edit" tab_preset="Admins"/>
+
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -54,6 +51,13 @@
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
+
+				addLoadEvent(
+					function() {
+						// fixes Firefox 2.0+ bug will password autocomplete
+						document.getElementById('<inp2:u_InputName field="Password"/>').value = '';
+					}
+				);
 			</script>
 		</td>
 		<inp2:m_RenderElement name="ml_selector" prefix="u"/>