diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index e2016f6d8aa..2bccdeed235 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -68,7 +68,7 @@ class res_partner(osv.osv):
                 'categ_id' : categ_ids and categ_ids[0] or '',
                 'state' :'draft',
                 'type': 'opportunity'
-            })
+            }, context=context)
             opportunity_ids[partner_id] = opportunity_id
         return opportunity_ids
 res_partner()
diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py
index 6322d0341c1..a1e1f0f2914 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity.py
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@ -58,6 +58,7 @@ class crm_partner2opportunity(osv.osv_memory):
 
     def make_opportunity(self, cr, uid, ids, context=None):
         partner_ids = context and context.get('active_ids', []) or []
+        partner_id = partner_ids[0] if partner_ids else None
         partner = self.pool.get('res.partner')
         lead = self.pool.get('crm.lead')
         data = self.browse(cr, uid, ids, context=context)[0]
@@ -65,6 +66,8 @@ class crm_partner2opportunity(osv.osv_memory):
             data.name,
             data.planned_revenue,
             data.probability,
+            partner_id,
+            context=context,
         )
         opportunity_id = opportunity_ids[partner_ids[0]]
         return lead.redirect_opportunity_view(cr, uid, opportunity_id, context=context)