diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 772dcd57e12..dac62cf5e12 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -178,11 +178,12 @@ class account_analytic_account(osv.osv):
             }, string='Currency', type='many2one', relation='res.currency'),
     }
     
-    def on_change_partner_id(self, cr, uid, ids,partner_id, context={}):
+    def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}):
         res={}
         if partner_id:
             part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context)
-            res['name'] = part.name
+            if not name:
+                res['name'] = part.name
             if part.user_id:res['user_id'] = part.user_id.id
         return {'value': res}
 
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index e83a2485e0b..c8576f564b6 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -11,7 +11,7 @@
                     <sheet string="Analytic account" layout="auto">
                         <group colspan="4" col="4" class="oe_form_group_label_border">
                             <field name="name" string="Contract/Project Name"/>
-                            <field name="partner_id" on_change="on_change_partner_id(partner_id)" required="True"/>
+                            <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" required="True"/>
                             <field name="code"/>
                             <field name="user_id"/>
                             <field name="company_id" on_change="on_change_company(company_id)" select="2" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 257fde74ce9..e83cd2c6d22 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -77,8 +77,8 @@ class account_analytic_account(osv.osv):
     _defaults = {
         'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
     }
-    def on_change_partner_id(self, cr, uid, ids,partner_id, context={}):
-        res = super(account_analytic_account,self).on_change_partner_id(cr, uid, ids,partner_id, context=context)
+    def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}):
+        res = super(account_analytic_account,self).on_change_partner_id(cr, uid, ids,partner_id, name, context=context)
         part = self.pool.get('res.partner').browse(cr, uid, partner_id,context=context)
         pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
         if pricelist:res['value']['pricelist_id'] = pricelist