diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index 811d6f21bf5721b8b9ba1eab9df5a9b85cb1b504..6d161d581f897eebdf4f61929a159c85781c1c2f 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -53,16 +53,18 @@ class base_setup_company(osv.osv_memory):
         """ get default company if any, and the various other fields
         from the company's fields
         """
+        base_mod = self.pool.get('ir.module.module').search(cr, uid, [('name','ilike','base')])
+        base_mod_rec = self.pool.get('ir.module.module').browse(cr, uid, base_mod)[0]
         defaults = super(base_setup_company, self)\
               .default_get(cr, uid, fields_list=fields_list, context=context)
-
         companies = self.pool.get('res.company')
         company_id = companies.search(cr, uid, [], limit=1, order="id")
         if not company_id or 'company_id' not in fields_list:
             return defaults
         company = companies.browse(cr, uid, company_id[0])
-
         defaults['company_id'] = company.id
+        if not base_mod_rec.demo:
+            return defaults
         defaults['currency'] = company.currency_id.id
         for field in ['name','logo','rml_header1','rml_footer1','rml_footer2']:
             defaults[field] = company[field]