diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 9e1639fbea9..1dc91261448 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -60,11 +60,13 @@ class crm_opportunity(osv.osv):
         @param *args: Tuple Value for additional Params
         """
         res = super(crm_opportunity, self).case_close(cr, uid, ids, args)
+        value = {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')}
         data_obj = self.pool.get('ir.model.data')
         data_id = data_obj._get_id(cr, uid, 'crm', 'stage_lead5')
         stage_id = data_obj.browse(cr, uid, data_id).res_id
         stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage_id)
-        value = {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'), 'probability': stage_obj.probability, 'stage_id': stage_id}
+        if stage_obj.on_change:
+            value.update({'probability': stage_obj.probability, 'stage_id': stage_id})
 
         self.write(cr, uid, ids, value)
         for (id, name) in self.name_get(cr, uid, ids):
@@ -83,11 +85,13 @@ class crm_opportunity(osv.osv):
         @param *args: Tuple Value for additional Params
         """
         res = super(crm_opportunity, self).case_close(cr, uid, ids, args)
+        value = {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')}
         data_obj = self.pool.get('ir.model.data')
         data_id = data_obj._get_id(cr, uid, 'crm', 'stage_lead6')
         stage_id = data_obj.browse(cr, uid, data_id).res_id
         stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage_id)
-        value = {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S'), 'probability': stage_obj.probability, 'stage_id': stage_id}
+        if stage_obj.on_change:
+            value.update({'probability': stage_obj.probability, 'stage_id': stage_id})
 
         self.write(cr, uid, ids, value)
         for (id, name) in self.name_get(cr, uid, ids):