diff --git a/bin/addons/base/base.sql b/bin/addons/base/base.sql
index 4f8d89e8ff5..58b30a89cf2 100644
--- a/bin/addons/base/base.sql
+++ b/bin/addons/base/base.sql
@@ -340,7 +340,7 @@ CREATE TABLE ir_model_data (
 -- Users
 ---------------------------------
 
-insert into res_users (id,login,password,name,action_id,active,company_id) values (1,'admin',NULL,'Administrator',NULL,True,1);
+insert into res_users (id,login,password,name,action_id,active) values (1,'admin',NULL,'Administrator',NULL,True);
 insert into ir_model_data (name,module,model,noupdate,res_id) values ('user_root','base','res.users',True,1);
 
 -- Compatibility purpose, to remove V6.0
diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml
index 710bddeb73d..c8d3e39dd22 100644
--- a/bin/addons/base/base_data.xml
+++ b/bin/addons/base/base_data.xml
@@ -1245,6 +1245,9 @@
             <test expr="currency_id.code == 'eur'.upper()"/>
             <test expr="name">Tiny sprl</test>
         </assert>
+        <record id="user_admin" model="res.users">
+            <field name="company_id" ref="main_company"/>
+        </record>    
 
     </data>
 </openerp>