diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index 2661e67cd50..ec89d280774 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -103,7 +103,6 @@
             <field name="type">normal</field>
             <field name="state">open</field>
             <field name="partner_id" ref="base.res_partner_seagate"/>
-            <field name="contact_id" ref="base.res_partner_address_seagate"/>
         </record>
         <record id="analytic_seagate_p2" model="account.analytic.account">
             <field name="name">Seagate P2</field>
@@ -112,7 +111,6 @@
             <field name="parent_id" ref="analytic_integration"/>
             <field name="state">open</field>
             <field name="partner_id" ref="base.res_partner_seagate"/>
-            <field name="contact_id" ref="base.res_partner_address_seagate"/>
         </record>
         <record id="analytic_magasin_bml_1" model="account.analytic.account">
             <field name="name">Magasin BML 1</field>
@@ -120,7 +118,6 @@
             <field name="parent_id" ref="analytic_integration"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_15"/>
-            <field name="contact_id" ref="base.res_partner_address_14"/>
         </record>
         <record id="analytic_integration_c2c" model="account.analytic.account">
             <field name="name">CampToCamp</field>
@@ -130,7 +127,6 @@
             <field eval="time.strftime('%Y-12-31')" name="date"/>
             <field name="parent_id" ref="analytic_integration"/>
             <field name="partner_id" ref="base.res_partner_c2c"/>
-            <field name="contact_id" ref="base.res_partner_address_Camptocamp"/>
             <field name="state">open</field>
         </record>
         <record id="analytic_agrolait" model="account.analytic.account">
@@ -139,7 +135,6 @@
             <field name="parent_id" ref="analytic_customers"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_agrolait"/>
-            <field name="contact_id" ref="base.res_partner_address_8"/>
         </record>
         <record id="analytic_asustek" model="account.analytic.account">
             <field name="name">Asustek</field>
@@ -147,7 +142,6 @@
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_customers"/>
             <field name="partner_id" ref="base.res_partner_asus"/>
-            <field name="contact_id" ref="base.res_partner_address_tang"/>
         </record>
         <record id="analytic_distripc" model="account.analytic.account">
             <field name="name">DistriPC</field>
@@ -155,7 +149,6 @@
             <field name="parent_id" ref="analytic_customers"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_4"/>
-            <field name="contact_id" ref="base.res_partner_address_7"/>
         </record>
         <record id="analytic_sednacom" model="account.analytic.account">
             <field name="name">Sednacom</field>
@@ -165,7 +158,6 @@
             <field name="parent_id" ref="analytic_partners"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_sednacom"/>
-            <field name="contact_id" ref="base.res_partner_address_11"/>
             <field name="state">open</field>
         </record>
         <record id="analytic_thymbra" model="account.analytic.account">
@@ -176,7 +168,6 @@
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_thymbra"/>
-            <field name="contact_id" ref="base.res_partner_address_thymbra"/>
             <field name="state">open</field>
         </record>
         <record id="analytic_leclerc" model="account.analytic.account">
@@ -187,7 +178,6 @@
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_11"/>
-            <field name="contact_id" ref="base.res_partner_address_15"/>
         </record>
         <record id="analytic_desertic_hispafuentes" model="account.analytic.account">
             <field name="name">Desertic - Hispafuentes</field>
@@ -197,7 +187,6 @@
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
-            <field name="contact_id" ref="base.res_partner_address_3000"/>
         </record>
         <record id="analytic_tiny_at_work" model="account.analytic.account">
             <field name="name">OpenERP SA AT Work</field>
@@ -205,7 +194,6 @@
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_tinyatwork"/>
-            <field name="contact_id" ref="base.res_partner_address_tinyatwork"/>
         </record>
         <record id="analytic_partners_camp_to_camp" model="account.analytic.account">
             <field name="name">Camp to Camp</field>
@@ -215,7 +203,6 @@
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_c2c"/>
-            <field name="contact_id" ref="base.res_partner_address_Camptocamp"/>
             <field name="state">open</field>
         </record>
         <record id="analytic_project_2_support" model="account.analytic.account">
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 9f9aca2c8fb..2998ea72e34 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -93,7 +93,6 @@
                             <group colspan="2" col="2">
                                 <separator colspan="2" string="Contacts"/>
                                 <field name="partner_id" on_change="on_change_partner_id(partner_id)"/>
-                                <field name="contact_id"/>
                                 <field name="user_id"/>
                             </group>
                             <group colspan="2" col="2" name="contract">
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 6241b6e06f0..8f988bea148 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -165,7 +165,6 @@ class account_analytic_account(osv.osv):
         'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
         'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
-        'contact_id': fields.many2one('res.partner.address', 'Contact'),
         'user_id': fields.many2one('res.users', 'Account Manager'),
         'date_start': fields.date('Date Start'),
         'date': fields.date('Date End', select=True),
@@ -199,7 +198,6 @@ class account_analytic_account(osv.osv):
         'state': 'open',
         'user_id': lambda self, cr, uid, ctx: uid,
         'partner_id': lambda self, cr, uid, ctx: ctx.get('partner_id', False),
-        'contact_id': lambda self, cr, uid, ctx: ctx.get('contact_id', False),
         'date_start': lambda *a: time.strftime('%Y-%m-%d'),
         'currency_id': _get_default_currency,
     }
@@ -221,9 +219,9 @@ class account_analytic_account(osv.osv):
 
     def on_change_partner_id(self, cr, uid, id, partner_id, context={}):
         if not partner_id:
-            return {'value': {'contact_id': False}}
+            return {'value': {'partner_id': False}}
         addr = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['invoice'])
-        return {'value': {'contact_id': addr.get('invoice', False)}}
+        return {'value': {'partner_id': addr.get('invoice', False)}}
 
     def on_change_company(self, cr, uid, id, company_id):
         if not company_id:
@@ -247,9 +245,9 @@ class account_analytic_account(osv.osv):
     def onchange_partner_id(self, cr, uid, ids, partner, context=None):
         partner_obj = self.pool.get('res.partner')
         if not partner:
-            return {'value':{'contact_id': False}}
+            return {'value':{'partner_id': False}}
         address = partner_obj.address_get(cr, uid, [partner], ['contact'])
-        return {'value':{'contact_id': address['contact']}}
+        return {'value':{'partner_id': address['contact']}}
 
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
         if not args: