diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 15af89acae7..be5819ec79b 100644
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -295,7 +295,8 @@ class res_partner_address(osv.osv):
         'mobile': fields.char('Mobile', size=64),
         'birthdate': fields.char('Birthdate', size=64),
         'active': fields.boolean('Active', help="Uncheck the active field to hide the contact."),
-        'company_id': fields.related('partner_id','company_id',type='many2one',relation='res.company',string='Company', store=True),
+#        'company_id': fields.related('partner_id','company_id',type='many2one',relation='res.company',string='Company', store=True),
+        'company_id': fields.many2one('res.company', 'Company',select=1),
     }
     _defaults = {
         'active': lambda *a: 1,
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 6559cd3bcc1..679d395c431 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -96,6 +96,7 @@
                     <field name="name" select="1"/>
                     <field domain="[('domain', '=', 'contact')]" name="title" />
                     <field name="function"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <newline/>
                       <group string="Postal Address" colspan="2" col="2">
                         <field name="street" select="2"/>
@@ -153,6 +154,7 @@
                     <field name="street2"/>
                     <field name="type" select="2"/>
                     <field name="function"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <newline/>
                     <field name="zip" select="2"/>
                     <field name="city" select="2"/>