diff --git a/addons/crm/data/crm_lead_demo.xml b/addons/crm/data/crm_lead_demo.xml
index 75d6da17ae1..10f47973e20 100644
--- a/addons/crm/data/crm_lead_demo.xml
+++ b/addons/crm/data/crm_lead_demo.xml
@@ -64,10 +64,10 @@
             <field name="subject">Inquiry</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_1"/>
-            <field name="author_id" ref="base.partner_admin"/>
+            <field name="author_id" eval="False"/>
             <field name="email_from">jdunagan@leclub.example.com</field>
             <field name="body"><![CDATA[<p>Hello,<br />
-            I am Jacques from Le Club SARL. I am interested to attend a training organized in your company.<br />
+            I am Jacques from Le Club SARL. I am interested in attending a training organized by your company.<br />
             Can you send me the details ?</p>]]></field>
             <field name="message_type">email</field>
             <field name="subtype_id" ref="mail.mt_comment"/>
@@ -99,10 +99,12 @@
         <record id="msg_case2_1" model="mail.message">
             <field name="subject">Need Details</field>
             <field name="model">crm.lead</field>
-            <field name="author_id" ref="base.partner_demo"/>
+            <field name="author_id" eval="False"/>
+            <field name="email_from">md@oilcompany.fr</field>
             <field name="res_id" ref="crm_case_2"/>
             <field name="body">Want to know features and benefits of using the new software.</field>
-            <field name="message_type">comment</field>
+            <field name="message_type">email</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
         </record>
 
         <record id="crm_case_3" model="crm.lead">
@@ -177,7 +179,7 @@
             <field name="subject">Inquiry</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_5"/>
-            <field name="author_id" ref="base.partner_admin"/>
+            <field name="author_id" eval="False"/>
             <field name="email_from">helle@stonageit.example.com</field>
             <field name="body"><![CDATA[<p>Hi,<br />
 Can you send me a quotation for 20 computers with speakers?<br />
@@ -258,7 +260,7 @@ Contact: +1 813 494 5005</p>]]></field>
             <field name="subject">Inquiry</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_8"/>
-            <field name="author_id" ref="base.partner_admin"/>
+            <field name="author_id" eval="False"/>
             <field name="email_from">logan_expert@gmail.example.com</field>
             <field name="body"><![CDATA[<p>Hi,<br />
 Could you send me your product catalogue please ?<br />
@@ -314,7 +316,7 @@ ESM Expert<br />]]></field>
             <field name="subject">Inquiry</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_10"/>
-            <field name="author_id" ref="base.partner_admin"/>
+            <field name="author_id" eval="False"/>
             <field name="email_from">jga@solar.example.com</field>
             <field name="body"><![CDATA[<p>Hi,<br />
 I would like to know more about specification and cost of laptops of your company.<br />
@@ -454,7 +456,7 @@ Andrew</p>]]></field>
 
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="author_id" ref="base.partner_admin"/>
+            <field name="author_id" ref="base.res_partner_2"/>
             <field name="email_from">virginie@agrolait.fr</field>
             <field name="body"><![CDATA[<div>
             <p>Hello,</p>
@@ -486,7 +488,7 @@ Andrew</p>]]></field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
             <field name="email_from">virginie@agrolait.fr</field>
-            <field name="author_id" ref="base.partner_admin"/>
+            <field name="author_id" ref="base.res_partner_2"/>
             <field name="body"><![CDATA[<p>Thanks for the information!<br />I asked a precise specification to our technical expert. Here is what we precisely need:</p>
             <ul>
                 <li>weekly backups, every Monday</li>