diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index c354c8eccc8..3ab3334e7d9 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -60,10 +60,12 @@ class crm_lead2partner(osv.osv_memory):
             partner_ids = partner.search(cr, uid, [('email', '=', this.email_from)], context=context)
             if partner_ids:
                 partner_id = partner_ids[0]
-        if this.partner_id and this.partner_name:
+        if not this.partner_id and this.partner_name:
             partner_ids = partner.search(cr, uid, [('name', '=', this.partner_name)], context=context)
             if partner_ids:
                 partner_id = partner_ids[0]
+        if this.partner_id:
+            partner_id = this.partner_id.id
         return partner_id
 
     def default_get(self, cr, uid, fields, context=None):