diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index bd0b56facc0..ff9c339b568 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -124,11 +124,13 @@
                 <form string="Stage">
                     <separator string="Stage Definition" colspan="4"/>
                     <field name="name" select="1"/>
-                    <field name="type" invisible="1" />
+                    <field name="type" groups="base.group_extended" />
                      
                     <field name="sequence"/>
                     <field name="probability"/>
-                    <field name="on_change"/>
+                    <group colspan="4" col="2" >
+                        <field name="on_change"/>
+                    </group>
                     <separator string="Requirements" colspan="4"/>
                     <field name="requirements" nolabel="1" colspan="4"/>
             <field name="section_ids" invisible="1" />
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index b8cdb9feb79..05d0d9e7dbd 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -70,8 +70,10 @@ class crm_lead2opportunity(osv.osv_memory):
                 cr, uid, opportunity_view_tree, context=context).res_id
 
         lead = leads.browse(cr, uid, record_id, context=context)
-        stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=','opportunity'),('sequence','>=',1)])
-
+        if(lead.section_id):
+            stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=','opportunity'),('sequence','>=',1), ('section_ids','=', lead.section_id.id)])
+        else:
+            stage_ids = self.pool.get('crm.case.stage').search(cr, uid, [('type','=','opportunity'),('sequence','>=',1)])
         for this in self.browse(cr, uid, ids, context=context):
             vals ={
                 'planned_revenue': this.planned_revenue,