diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml
index f741a7925bc..628cfc4f858 100644
--- a/openerp/addons/base/res/res_users_view.xml
+++ b/openerp/addons/base/res/res_users_view.xml
@@ -1,6 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
+        <!-- change password wizard -->
+        <record id="change_password_wizard_view" model="ir.ui.view">
+            <field name="name">Change Password</field>
+            <field name="model">change.password.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Change Password" version="7.0">
+                    <field name="user_ids"/>
+                    <footer>
+                        <button string="Change Password" name="change_password_button" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+        <record id="change_password_wizard_user_tree_view" model="ir.ui.view">
+            <field name="name">Change Password Users</field>
+            <field name="model">change.password.user</field>
+            <field name="arch" type="xml">
+                <!-- the user list is editable, but one cannot add or delete rows -->
+                <tree string="Users" editable="bottom" create="false" delete="false">
+                    <field name="user_login"/>
+                    <field name="new_passwd" required="True" password="True"/>
+                </tree>
+            </field>
+        </record>
+        <act_window id="change_password_wizard_action"
+            name="Change Password"
+            src_model="res.users"
+            res_model="change.password.wizard"
+            view_type="form" view_mode="form"
+            key2="client_action_multi" target="new"
+            groups="base.group_erp_manager"/>
+
         <!-- res.groups -->
         <record id="view_groups_search" model="ir.ui.view">
             <field name="name">res.groups.search</field>
@@ -277,43 +312,6 @@
             <field name="act_window_id" ref="action_res_users_my"/>
         </record>
 
-        <!-- wizard action on res.users -->
-        <act_window id="change_password_wizard_action"
-            name="Change Password"
-            src_model="res.users"
-            res_model="change.password.wizard"
-            view_type="form" view_mode="form"
-            key2="client_action_multi" target="new"
-            groups="base.group_erp_manager"/>
-
-        <!-- wizard view -->
-        <record id="change_password_wizard_view" model="ir.ui.view">
-            <field name="name">Change Password</field>
-            <field name="model">change.password.wizard</field>
-            <field name="arch" type="xml">
-                <form string="Change Password" version="7.0">
-                    <field name="user_ids"/>
-                    <footer>
-                        <button string="Change Password" name="change_password_button" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <!-- wizard user list view -->
-        <record id="change_password_wizard_user_tree_view" model="ir.ui.view">
-            <field name="name">Change Password Users</field>
-            <field name="model">change.password.user</field>
-            <field name="arch" type="xml">
-                <!-- the user list is editable, but one cannot add or delete rows -->
-                <tree string="Users" editable="bottom" create="false" delete="false">
-                    <field name="user_login"/>
-                    <field name="new_passwd" required="True" password="True"/>
-                </tree>
-            </field>
-        </record>
 
     </data>
 </openerp>