diff --git a/openerp/addons/base/base_update.xml b/openerp/addons/base/base_update.xml
index 597fa824a59..30bd6800924 100644
--- a/openerp/addons/base/base_update.xml
+++ b/openerp/addons/base/base_update.xml
@@ -70,30 +70,35 @@
             <field name="type">form</field>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <form string="Users">
-                    <field name="name" readonly="1"/>
+                <form string="Users" layout="auto">
+                    <div class="oe_form_title" colspan="4">
+                        <field name="name" readonly="1" nolabel="1"/>
+                        (<field name="login" readonly="1" nolabel="1"/>)
+                    </div>
                     <newline/>
-                    <group colspan="2" col="3">
-                        <group col="2" colspan="2" name="preferences">
+                    <group col="2" colspan="3">
+                        <group col="2" colspan="2" name="preferences" class="oe_form_group_label_border">
                             <separator string="Preferences" colspan="2"/>
                             <field name="view" readonly="0"/>
                             <field name="context_lang" readonly="0"/>
                             <field name="context_tz" readonly="0"/>
                             <field name="menu_tips" readonly="0" groups="base.group_no_one"/>
                         </group>
-                        <group col="2" colspan="1">
-                            <separator string="Avatar" colspan="2"/>
-                            <field name="avatar" widget='image' nolabel="1" colspan="2" on_change="onchange_avatar(avatar)" readonly="0"/>
+                        <group name="default_filters" colspan="2" col="2" class="oe_form_group_label_border">
+                            <separator string="Default Filters" colspan="2"/>
+                            <field name="company_id" widget="selection" readonly="0"
+                                groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
                         </group>
                     </group>
-                    <group name="default_filters" colspan="2" col="2">
-                        <separator string="Default Filters" colspan="2"/>
-                        <field name="company_id" widget="selection" readonly="0"
-                            groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
+                    <group col="1">
+                        <separator string="Avatar"/>
+                        <field name="avatar" widget='image' nolabel="1" on_change="onchange_avatar(avatar)" readonly="0"/>
+                    </group>
+                    <group col="2" colspan="4" class="oe_form_group_label_border">
+                        <separator string="Email Preferences" colspan="2"/>
+                        <field name="user_email" widget="email" readonly="0"/>
+                        <field name="signature" readonly="0"/>
                     </group>
-                    <separator string="Email Preferences" colspan="4"/>
-                    <field colspan="4" name="user_email" widget="email" readonly="0"/>
-                    <field colspan="4" name="signature" readonly="0"/>
                 </form>
             </field>
         </record>