diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 856fc209768..66376ed2acc 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -82,16 +82,15 @@
                                     context="{'user_id': self, 'user_preference': 1}" groups="base.group_multi_company"/>
                             <field name="view" readonly="0"/>
                             <label string="" colspan="2"/>
-                            <field name="menu_tips" colspan="2" readonly="0"/>
                             <newline/>
-                            <separator colspan="4" string="Preferences"/>
                         </page>
                          <page string="Preferences">
-                            <field name="password" password="True" readonly="0" colspan="4"/>
+                            <field name="password" password="True" readonly="0" />
+                            <field name="context_lang" completion="1" readonly="0"/>
                             <label string="" colspan="1"/>
                             <label colspan="3" string="You must logout and login again after changing your password."/>
-                            <field name="context_lang" completion="1" readonly="0"/>
                             <field name="context_tz" completion="1" readonly="0"/>
+                            <field name="menu_tips" colspan="2" readonly="0"/>
                             <separator string="Email &amp; Signature" colspan="4"/>
                             <group colspan="4"><field name="user_email" widget="email"/></group>
                             <field colspan="4" name="signature" readonly="0" nolabel="1"/>
@@ -114,16 +113,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"/>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index e49578e9cc6..3b25343d724 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -240,7 +240,7 @@ 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'),
@@ -264,7 +264,7 @@ class users(osv.osv):
                                 selection=[('simple','Simplified'),('extended','Extended')],
                                 string='Interface', help="Choose between the simplified interface and the extended one"),
         'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240),
-        'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to display tips on each menu action"),
+        'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
 
     }