diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index aa3a5bfc24c..717ad673fe1 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -50,7 +50,7 @@ class crm_lead(base_stage, format_address, osv.osv):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         section_id = self._get_default_section_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft'),'|', ('type', '=', 'lead'),('type', '=', 'both')], context=context)
+        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft')], context=context)
 
     def _resolve_section_id_from_context(self, cr, uid, context=None):
         """ Returns ID of section based on the value of 'section_id'
@@ -338,7 +338,9 @@ class crm_lead(base_stage, format_address, osv.osv):
             cases = self.browse(cr, uid, cases, context=context)
         # collect all section_ids
         section_ids = []
-        types = ['lead','both']
+        types = ['both']
+        if not cases :
+            types += ['lead', 'opportunity']
         if section_id:
             section_ids.append(section_id)
         for lead in cases: