diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index 043bf8d210b..c37b0915d5c 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -12,7 +12,8 @@
             <field name="city">Vivegnis</field>
             <field name="zip">4683</field>
             <field name="country_id" ref="base.be"/>
-            <field name="street">Rue Cesar de Paepe, 43</field>
+            <field name="street">YourCompany</field>
+            <field name="street2">Rue Cesar de Paepe, 43</field>
         </record>
         <record id="demo_user0" model="res.users" context="{'no_reset_password': True}">
             <field name="partner_id" ref="partner_demo_portal"/>
diff --git a/openerp/addons/base/base_demo.xml b/openerp/addons/base/base_demo.xml
index 12fdc284896..9fccc5898de 100644
--- a/openerp/addons/base/base_demo.xml
+++ b/openerp/addons/base/base_demo.xml
@@ -7,7 +7,8 @@
             <field name="company_id" ref="main_company"/>
             <field name="customer" eval="False"/>
             <field name="email">demo@yourcompany.example.com</field>
-            <field name="street">Avenue des Dessus-de-Lives, 2</field>
+            <field name="street">YourCompany</field>
+            <field name="street2">Avenue des Dessus-de-Lives, 2</field>
             <field name="city">Namur (Loyers)</field>
             <field name="zip">5101</field>
             <field name="country_id" ref="be"/>
@@ -21,7 +22,8 @@
 
         <record id="main_partner" model="res.partner">
             <field name="name">YourCompany</field>
-            <field name="street">1725 Slough Ave.</field>
+            <field name="street">YourCompany</field>
+            <field name="street2">1725 Slough Ave.</field>
             <field name="city">Scranton</field>
             <field name="zip">18540</field>
             <field name='country_id' ref='base.us'/>
@@ -46,6 +48,13 @@
         </record>
 
         <record model="res.partner" id="base.partner_root">
+            <field name="street">YourCompany</field>
+            <field name="street2">215 Vine St</field>
+            <field name="city">Scranton</field>
+            <field name="zip">18503</field>
+            <field name='country_id' ref='base.us'/>
+            <field name='state_id' ref='state_us_39'/>
+            <field name="phone">+1 555-555-5555</field>
             <field name="email">admin@yourcompany.example.com</field>
             <field name="tz">Europe/Brussels</field>
             <field name="image" type="base64" file="base/static/img/partner_root-image.jpg"/>