diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index d2198767be2..fa1f407002f 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -78,7 +78,7 @@
                 <form string="Users">
                     <field name="password" password="True" readonly="0"/>
                     <label colspan="4" string="Please note that you will have to logout and relog if you change your password."/>
-                    <field name="context_company"/>
+                    <field name="company"/>
                     <field name="context_lang" completion="1" readonly="0"/>
                     <field name="context_tz" completion="1" readonly="0" colspan="4"/>
                     <newline/>
diff --git a/bin/addons/base/res/res_user.py b/bin/addons/base/res/res_user.py
index b37f0cf75e8..3a7dda25359 100644
--- a/bin/addons/base/res/res_user.py
+++ b/bin/addons/base/res/res_user.py
@@ -136,7 +136,7 @@ class users(osv.osv):
         'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Accepted Companies'),        
         'context_lang': fields.selection(_lang_get, 'Language', required=True),
         'context_tz': fields.selection(_tz_get,  'Timezone', size=64),
-        'context_company': fields.selection(_companies_get,  'Company', size=64),        
+        'company': fields.selection(_companies_get,  'Company', size=64),        
     }
     def read(self,cr, uid, ids, fields=None, context=None, load='_classic_read'):
         def override_password(o):
@@ -201,7 +201,7 @@ class users(osv.osv):
                     ok=False
             if ok:
                 uid = 1
-        context_company=values.get('context_company',False)
+        context_company=values.get('company',False)
         if context_company:
             values.update({'company_id':context_company})                
         res = super(users, self).write(cr, uid, ids, values, *args, **argv)