diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index 8f16a491bc7..b30669382a5 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -49,12 +49,16 @@ class base_setup_company(osv.osv_memory):
     def _get_all_countries(self, cr, uid, context=None):
         return self._get_all(cr, uid, 'res.country', context=context)
 
+    def _show_company_data(self, cr, uid, context=None):
+        # We only want to show the default company data in demo mode, otherwise users tend to forget
+        # to fill in the real company data in their production databases
+        return self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'module_meta_information').demo
+
+
     def default_get(self, cr, uid, fields_list=None, context=None):
         """ 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')
@@ -63,8 +67,10 @@ class base_setup_company(osv.osv_memory):
             return defaults
         company = companies.browse(cr, uid, company_id[0])
         defaults['company_id'] = company.id
-        if not base_mod_rec.demo:
+
+        if not self._show_company_data(cr, uid, context=context):
             return defaults
+
         defaults['currency'] = company.currency_id.id
         for field in ['name','logo','rml_header1','rml_footer1','rml_footer2']:
             defaults[field] = company[field]