diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 30bd6800924..46217aa2b9a 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -108,54 +108,57 @@
             <field name="model">res.users</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Users">
-                    <group colspan="4" col="6">
-                        <field name="name" select="1"/>
-                        <field name="login" select="1"/>
+                <form string="Users" layout="manual">
+                    <sheet layout="auto">
                         <field name="id" invisible="1"/>
-                        <field name="new_password" password="True" attrs="{'required': [('id','=',False)]}"/>
-                        <field name="active"/>
-                    </group>
-                    <notebook colspan="4">
-                        <page string="User">
-                            <group colspan="4" col="7">
-                                <!-- Second nested group to avoid misalignment with email prefs groups
-                                    in simplified view -->
-                                <group colspan="7" col="7">
-                                    <group col="2" colspan="1" name="avatar">
-                                        <separator string="Avatar" colspan="2"/>
-                                        <field name="avatar" widget='image' nolabel="1" colspan="2" on_change="onchange_avatar(avatar)"/>
-                                    </group>
-                                    <group col="3" colspan="2" name="preferences">
-                                        <separator string="Preferences" colspan="3"/>
+                        <group colspan="4" col="4" class="oe_form_group_label_border">
+                            <field name="name" select="1"/>
+                            <field name="login" select="1"/>
+                            <field name="new_password" password="True" attrs="{'required': [('id','=',False)]}"/>
+                            <field name="active"/>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="User">
+                                <group col="2" colspan="3" width="80%%">
+                                    <group col="2" name="preferences" class="oe_form_group_label_border">
+                                        <separator string="Preferences" colspan="2"/>
                                         <field name="context_lang"/>
                                         <field name="context_tz"/>
                                         <field name="menu_tips"/>
                                     </group>
-                                    <group name="default_filters" colspan="2" col="2">
-                                        <separator string="Default Filters" colspan="2"/>
-                                        <field name="company_id" required="1" context="{'user_preference': 0}" groups="base.group_multi_company"/>
-                                    </group>
-                                    <group colspan="2" col="2" groups="base.group_extended">
-                                        <separator string="Action" colspan="2"/>
-                                        <field name="action_id"/>
-                                        <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
+                                    <group col="1">
+                                        <group col="2" groups="base.group_extended" class="oe_form_group_label_border">
+                                            <separator string="Action" colspan="2"/>
+                                            <field name="action_id"/>
+                                            <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
+                                        </group>
+                                        <group name="default_filters" col="2" class="oe_form_group_label_border">
+                                            <separator string="Default Filters" colspan="2"/>
+                                            <field name="company_id" required="1" context="{'user_preference': 0}" groups="base.group_multi_company"/>
+                                        </group>
                                     </group>
                                 </group>
-                                <group colspan="7" col="2">
+                                <group col="1" name="avatar" class="oe_form_group_label_border">
+                                    <separator string="Avatar"/>
+                                    <field name="avatar" widget='image' nolabel="1" on_change="onchange_avatar(avatar)"/>
+                                </group>
+
+                                <group colspan="4" col="2" class="oe_form_group_label_border">
                                     <separator string="Email Preferences" colspan="2"/>
                                     <field name="user_email" widget="email"/>
                                     <field name="signature"/>
                                 </group>
-                            </group>
-                        </page>
-                        <page string="Access Rights">
-                            <field nolabel="1" name="groups_id"/>
-                        </page>
-                        <page string="Allowed Companies" groups="base.group_multi_company">
-                            <field colspan="4" nolabel="1" name="company_ids" select="1"/>
-                        </page>
-                    </notebook>
+                            </page>
+                            <page string="Access Rights">
+                                <group colspan="4" col="4" class="oe_form_group_label_border">
+                                    <field nolabel="1" name="groups_id"/>
+                                </group>
+                            </page>
+                            <page string="Allowed Companies" groups="base.group_multi_company">
+                                <field colspan="4" nolabel="1" name="company_ids" select="1"/>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>