diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py
index 0df19df8eb7..84da9ea0613 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity.py
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@ -84,7 +84,7 @@ class crm_partner2opportunity(osv.osv_memory):
 
 
             categ_obj = self.pool.get('crm.case.categ')
-            categ_ids = categ_obj.search(cr, uid, [('name','ilike','Part%')])
+            categ_ids = categ_obj.search(cr, uid, [('object_id.model','=','crm.lead')])
 
             case_obj = self.pool.get('crm.lead')
             opp_id = case_obj.create(cr, uid, {
@@ -93,7 +93,7 @@ class crm_partner2opportunity(osv.osv_memory):
                 'probability' : make_opportunity_obj.probability,
                 'partner_id' : make_opportunity_obj.partner_id.id,
                 'partner_address_id' : address['default'],
-                'categ_id' : categ_ids[0],
+                'categ_id' : categ_ids and categ_ids[0] or '',
                 'state' :'draft',
                 'type': 'opportunity'
             })