diff --git a/bin/addons/base/base_demo.xml b/bin/addons/base/base_demo.xml
index 7779171fe08..73f6fa400a5 100644
--- a/bin/addons/base/base_demo.xml
+++ b/bin/addons/base/base_demo.xml
@@ -1,14 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+
+        <record id="demo_address" model="res.partner.address">
+            <field name="name">Fabien Dupont</field>
+            <field name="street">Chaussee de Namur</field>
+            <field name="zip">1367</field>
+            <field name="city">Gerompont</field>
+            <field name="phone">(+32).81.81.37.00</field>
+            <field name="type">default</field>
+            <field model="res.country" name="country_id" ref="be"/>
+            <!-- Company ID will be set later -->
+            <field name="company_id" eval="None"/>
+        </record>
+
         <record id="user_demo" model="res.users">
             <field name="login">demo</field>
             <field name="password">demo</field>
             <field name="name">Demo User</field>
             <field name="signature">Mr Demo</field>
-            <field name="address_id" ref="main_address"/>
+            <field name="address_id" ref="demo_address"/>
             <field name="company_id" ref="main_company"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user')])]"/> 
+            <field name="groups_id" eval="[(6,0,[ref('base.group_user')])]"/>
         </record>
     </data>
 </openerp>
diff --git a/bin/report/render/rml2pdf/utils.py b/bin/report/render/rml2pdf/utils.py
index 6f8616da96d..e631fcd9566 100644
--- a/bin/report/render/rml2pdf/utils.py
+++ b/bin/report/render/rml2pdf/utils.py
@@ -131,7 +131,7 @@ def _process_text(self, txt):
                     pass
                 if isinstance(txt, basestring):
                     result += str2xml(txt)
-                elif (txt is not None) and (txt is not False):
+                elif txt and (txt is not None) and (txt is not False):
                     result += ustr(txt)
         return result