diff --git a/openerp/addons/base/base_data.xml b/openerp/addons/base/base_data.xml
index 937cca7d53e..b5272596d98 100644
--- a/openerp/addons/base/base_data.xml
+++ b/openerp/addons/base/base_data.xml
@@ -1090,6 +1090,7 @@
         <record model="res.partner" id="base.partner_root">
             <field name="name">Administrator</field>
             <field name="company_id" ref="main_company"/>
+            <field name="customer" eval="False"/>
         </record>
 
         <record model="res.users" id="base.user_root">
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 66fa4f420de..3e22a937800 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -152,8 +152,10 @@ class users(osv.osv):
         # context is set.
         'company_id': fields.many2one('res.company', 'Company', required=True,
             help='The company this user is currently working for.', context={'user_preference': True}),
-        # 'context_company_id': fields.many2one('res.company', 'Company', required=True,
-        #     help='The company this user is currently working for.', context={'user_preference': True}),
+        # 'context_company_id': fields.related('context_company_id', rel='res.company', 
+        #     string='Company', required=True, context={'user_preference': True},
+        #     help='The company this user is currently working for.',
+        #     deprecated='Use the context_company_id field instead. This field will be removed as of OpenERP 7.1.'),
         'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Companies'),
         # backward compatibility fields
         'user_email': fields.related('email', type='char',
@@ -234,6 +236,7 @@ class users(osv.osv):
     _defaults = {
         'password' : '',
         'active' : True,
+        'customer': False,
         'menu_id': _get_menu,
         'company_id': _get_company,
         'company_ids': _get_companies,