diff --git a/addons/hr/data/hr_demo.xml b/addons/hr/data/hr_demo.xml
index 70b1f8b60e3..fec050f9a6e 100644
--- a/addons/hr/data/hr_demo.xml
+++ b/addons/hr/data/hr_demo.xml
@@ -198,7 +198,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="private_phone">+1 555-555-5555</field>
             <field name="private_email">admin@yourcompany.example.com</field>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(237)-125-2389</field>
+            <field name="work_phone">(555)-125-2389</field>
             <field name="work_email">admin@yourcompany.example.com</field>
             <field name="category_ids" eval="[Command.set([ref('employee_category_4'), ref('employee_category_3')])]"/>
             <field name="job_id" ref="hr.job_ceo"/>
@@ -221,7 +221,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="job_title">Marketing and Community Manager</field>
             <field name="category_ids" eval="[Command.set([ref('employee_category_4'), ref('employee_category_2')])]"/>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(916)-264-7362</field>
+            <field name="work_phone">(555)-264-7362</field>
             <field name="work_contact_id" ref="hr.work_contact_ngh"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_ngh-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -229,7 +229,7 @@ If you have development competencies, we can propose you specific traineeships</
 
         <record id="work_contact_qdp" model="res.partner">
             <field name="name">Marc Demo</field>
-            <field name="email">gilles@odoo.com</field>
+            <field name="email">m.demo@fake.odoo.com</field>
         </record>
 
         <record id="employee_qdp" model="hr.employee">
@@ -266,7 +266,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="job_title">Team Leader</field>
             <field name="category_ids" eval="[Command.set([ref('employee_category_4'), ref('employee_category_3')])]"/>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(376)-310-7863</field>
+            <field name="work_phone">(555)-310-7863</field>
             <field name="work_contact_id" ref="hr.work_contact_al"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_al-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -286,7 +286,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="job_title">Human Resources Manager</field>
             <field name="category_ids" eval="[Command.set([ref('employee_category_4')])]"/>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(360)-694-7266</field>
+            <field name="work_phone">(555)-694-7266</field>
             <field name="work_contact_id" ref="hr.work_contact_vad"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_vad-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -307,7 +307,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="private_country_id" ref="base.us"/>
             <field name="private_email">abigail.peterson33@example.com</field>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(482)-233-3393</field>
+            <field name="work_phone">(555)-233-3393</field>
             <field name="work_contact_id" ref="hr.work_contact_hne"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_hne-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -330,7 +330,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="private_country_id" ref="base.us"/>
             <field name="private_email">Audrey.peterson2020@example.com</field>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(203)-276-7903</field>
+            <field name="work_phone">(555)-276-7903</field>
             <field name="work_contact_id" ref="hr.work_contact_fpi"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_fpi-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -349,7 +349,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="job_id" ref="hr.job_marketing"/>
             <field name="job_title">Marketing and Community Manager</field>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(644)-169-1352</field>
+            <field name="work_phone">(555)-169-1352</field>
             <field name="work_contact_id" ref="hr.work_contact_lur"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_lur-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -368,7 +368,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="job_id" ref="hr.job_marketing"/>
             <field name="job_title">Marketing and Community Manager</field>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(206)-267-3735</field>
+            <field name="work_phone">(555)-267-3735</field>
             <field name="work_contact_id" ref="hr.work_contact_jod"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_jod-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -388,7 +388,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="job_title">Experienced Developer</field>
             <field name="category_ids" eval="[Command.set([ref('employee_category_4')])]"/>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(449)-505-5146</field>
+            <field name="work_phone">(555)-505-5146</field>
             <field name="work_contact_id" ref="hr.work_contact_fme"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_fme-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -409,7 +409,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="private_country_id" ref="base.us"/>
             <field name="private_email">Doris.cole.LoveSong@example.com</field>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(883)-331-5378</field>
+            <field name="work_phone">(555)-331-5378</field>
             <field name="work_contact_id" ref="hr.work_contact_jep"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_jep-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -428,7 +428,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="job_id" ref="hr.job_consultant"/>
             <field name="job_title">Consultant</field>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(944)-518-8232</field>
+            <field name="work_phone">(555)-518-8232</field>
             <field name="work_contact_id" ref="hr.work_contact_jgo"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_jgo-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -448,7 +448,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="job_title">Consultant</field>
             <field name="category_ids" eval="[Command.set([ref('employee_category_4'), ref('employee_category_5')])]"/>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(663)-707-8451</field>
+            <field name="work_phone">(555)-707-8451</field>
             <field name="work_contact_id" ref="hr.work_contact_jth"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_jth-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -456,7 +456,7 @@ If you have development competencies, we can propose you specific traineeships</
 
         <record id="work_contact_mit" model="res.partner">
             <field name="name">Anita Oliver</field>
-            <field name="mobile">(538)-672-3185</field>
+            <field name="mobile">(555)-672-3185</field>
             <field name="email">anita.oliver32@example.com</field>
             <field name="image_1920" type="base64" file="hr/static/img/employee_mit-image.jpg"/>
         </record>
@@ -472,7 +472,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="private_phone">(538)-672-3185</field>
             <field name="private_email">anita.oliver00@example.com</field>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(538)-497-4804</field>
+            <field name="work_phone">(555)-497-4804</field>
             <field name="work_contact_id" ref="hr.work_contact_mit"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_mit-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -492,7 +492,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="job_title">Experienced Developer</field>
             <field name="category_ids" eval="[Command.set([ref('employee_category_4')])]"/>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(450)-719-4182</field>
+            <field name="work_phone">(555)-719-4182</field>
             <field name="work_contact_id" ref="hr.work_contact_niv"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_niv-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -512,7 +512,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="job_title">Experienced Developer</field>
             <field name="category_ids" eval="[Command.set([ref('employee_category_4')])]"/>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(332)-775-6660</field>
+            <field name="work_phone">(555)-775-6660</field>
             <field name="work_contact_id" ref="hr.work_contact_stw"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_stw-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -532,7 +532,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="job_title">Experienced Developer</field>
             <field name="category_ids" eval="[Command.set([ref('employee_category_4')])]"/>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(157)-363-8229</field>
+            <field name="work_phone">(555)-363-8229</field>
             <field name="work_contact_id" ref="hr.work_contact_chs"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_chs-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -551,7 +551,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="job_id" ref="hr.job_developer"/>
             <field name="job_title">Experienced Developer</field>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(114)-262-1607</field>
+            <field name="work_phone">(555)-262-1607</field>
             <field name="work_contact_id" ref="hr.work_contact_jve"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_jve-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -570,7 +570,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="job_id" ref="hr.job_developer"/>
             <field name="job_title">Experienced Developer</field>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(350)-912-1201</field>
+            <field name="work_phone">(555)-912-1201</field>
             <field name="work_contact_id" ref="hr.work_contact_han"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_han-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
@@ -591,7 +591,7 @@ If you have development competencies, we can propose you specific traineeships</
             <field name="private_country_id" ref="base.us"/>
             <field name="private_email">beth.evans@example.com</field>
             <field name="work_location_id" ref="work_location_1"/>
-            <field name="work_phone">(754)-532-3841</field>
+            <field name="work_phone">(555)-532-3841</field>
             <field name="work_contact_id" ref="hr.work_contact_jog"/>
             <field name="image_1920" type="base64" file="hr/static/img/employee_jog-image.jpg"/>
             <field name="create_date">2010-01-01 00:00:00</field>
diff --git a/addons/lunch/data/lunch_demo.xml b/addons/lunch/data/lunch_demo.xml
index dbf82ad216e..12a0c9afda2 100644
--- a/addons/lunch/data/lunch_demo.xml
+++ b/addons/lunch/data/lunch_demo.xml
@@ -12,7 +12,7 @@
             <field name="country_id" ref="base.us"/>
             <field name="street">975 Bullock Orchard</field>
             <field name="zip">02155</field>
-            <field name="email">cynthiasanchez@gmail.com</field>
+            <field name="email">hungry_dog@yourcompany.example.com</field>
             <field name="company_id" ref="base.main_company"/>
         </record>
 
diff --git a/odoo/addons/base/data/res_partner_demo.xml b/odoo/addons/base/data/res_partner_demo.xml
index 7d6806a4fb6..3117aabbcf0 100644
--- a/odoo/addons/base/data/res_partner_demo.xml
+++ b/odoo/addons/base/data/res_partner_demo.xml
@@ -67,7 +67,7 @@
             <field name="state_id" ref='state_us_5'/>
             <field name="zip">94523</field>
             <field name="country_id" ref="base.us"/>
-            <field name="email">deco.addict82@example.com</field>
+            <field name="email">deco_addict@yourcompany.example.com</field>
             <field name="phone">(603)-996-3829</field>
             <field name="website">http://www.deco-addict.com</field>
             <field name="image_1920" type="base64" file="base/static/img/res_partner_2-image.png"/>
@@ -82,7 +82,7 @@
             <field name="state_id" ref='state_us_5'/>
             <field name="zip">94535</field>
             <field name="country_id" ref="base.us"/>
-            <field name="email">gemini.furniture39@example.com</field>
+            <field name="email">gemini_furniture@fake.geminifurniture.com</field>
             <field name="phone">(941)-284-4875</field>
             <field name="website">http://www.gemini-furniture.com/</field>
             <field name="image_1920" type="base64" file="base/static/img/res_partner_3-image.png"/>
diff --git a/odoo/addons/base/data/res_users_demo.xml b/odoo/addons/base/data/res_users_demo.xml
index 22440df6ea0..868023f9773 100644
--- a/odoo/addons/base/data/res_users_demo.xml
+++ b/odoo/addons/base/data/res_users_demo.xml
@@ -8,7 +8,7 @@
             <field name="company_name">YourCompany</field>
             <field name="street">3575  Buena Vista Avenue</field>
             <field name="city">Eugene</field>
-            <field name="state_id"  model="res.country.state" search="[('code','ilike','OR')]"/>
+            <field name="state_id"  model="res.country.state" search="[('code','=','OR')]"/>
             <field name="zip">97401</field>
             <field name="country_id" ref="us"/>
             <field name="tz">Europe/Brussels</field>