diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 7639418f825..02ea1c58e5c 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -114,16 +114,18 @@
                     <newline/>
                     <notebook colspan="4">
                         <page string="User">
-                            <field name="address_id" select="1"/>
-                            <field name="user_email" widget="email"/>
                             <field name="company_id" required="1"
                                 context="{'user_id': self, 'user_preference': 1}"
                                 on_change="on_change_company_id(company_id)"
                                 groups="base.group_multi_company"
-                                />
+                                />                        
+                            <field name="address_id" select="1"/>
+                            <field name="user_email" widget="email"/>
+                            <field name="context_lang"/>   
+                            <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>                                                    
                             <field name="action_id" required="True"/>
-                            <field domain="[('usage','=','menu')]" name="menu_id" required="True"/>
-                            <field name="context_lang"/>
+
+
                             <field name="context_tz"/>
                             <field name="view" readonly="0"/>
                             <field name="menu_tips" colspan="2"/>
@@ -141,7 +143,7 @@
                             <field colspan="4" nolabel="1" name="roles_id"/>
                         </page>
                         <page string="Companies">
-                            <field colspan="4" nolabel="1" name="company_ids" select="1"/>
+                            <field colspan="4" nolabel="1" name="company_ids" select="1" widget="selection"/>
                         </page>
                     </notebook>
                 </form>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index d8645a83cc0..db76c333730 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -240,10 +240,10 @@ class users(osv.osv):
                  " aren't configured, it won't be possible to email new "
                  "users."),
         'signature': fields.text('Signature', size=64),
-        'address_id': fields.many2one('res.partner.address', 'Address'),
+        'address_id': fields.many2one('res.partner.address', 'Company Address'),
         'active': fields.boolean('Active'),
         'action_id': fields.many2one('ir.actions.actions', 'Home Action'),
-        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action'),
+        'menu_id': fields.many2one('ir.actions.actions', 'Menu Action',help="Always Display Tips"),
         'groups_id': fields.many2many('res.groups', 'res_groups_users_rel', 'uid', 'gid', 'Groups'),
         'roles_id': fields.many2many('res.roles', 'res_roles_users_rel', 'uid', 'rid', 'Roles'),