diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 5af9b789d2a..2a469d88baa 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -198,7 +198,8 @@ class crm_lead(osv.osv, crm_case):
             self.write(cr, uid, ids, value)
 
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('The Lead') + " '" + name + "' "+ _("has been written as Open.")
+            type = self.browse(cr, uid, id).type
+            message = (_('The ') + type.title() or 'Lead') + " '" + name + "' "+ _("has been written as Open.")
             self.log(cr, uid, id, message)
         return res
 
@@ -213,8 +214,10 @@ class crm_lead(osv.osv, crm_case):
         res = super(crm_lead, self).case_close(cr, uid, ids, args)
         self.write(cr, uid, ids, {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')})
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('The Lead') + " '" + name + "' "+ _("has been written as Closed.")
-            self.log(cr, uid, id, message)
+            lead = self.browse(cr, uid, id)
+            if lead.type == 'lead':
+                message = _('The Lead') + " '" + name + "' "+ _("has been written as Closed.")
+                self.log(cr, uid, id, message)
         return res
 
     def convert_opportunity(self, cr, uid, ids, context=None):
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 1b7658a1ff9..a1ca912e20f 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -93,8 +93,10 @@ class crm_opportunity(osv.osv):
 
         res = self.write(cr, uid, ids, value)
         for (id, name) in self.name_get(cr, uid, ids):
-            message = _('The Opportunity') + " '" + name + "' "+ _("has been written as Lost.")
-            self.log(cr, uid, id, message)
+            opp = self.browse(cr, uid, id)
+            if opp.type == 'opportunity':
+                message = _('The Opportunity') + " '" + name + "' "+ _("has been written as Lost.")
+                self.log(cr, uid, id, message)
         return res
 
     def case_cancel(self, cr, uid, ids, *args):