4 files changed, 31 insertions, 6 deletions
diff --git a/odoo/addons/base/data/base_data.sql b/odoo/addons/base/data/base_data.sql
index 760205e3a89..58bdd7d3062 100644
--- a/odoo/addons/base/data/base_data.sql
+++ b/odoo/addons/base/data/base_data.sql
@@ -126,20 +126,20 @@ CREATE TABLE res_partner (
 ---------------------------------
 insert into res_currency (id, name, symbol) VALUES (1, 'EUR', '€');
 insert into ir_model_data (name, module, model, noupdate, res_id) VALUES ('EUR', 'base', 'res.currency', true, 1);
-select setval('res_currency_id_seq', 2);
+select setval('res_currency_id_seq', 1);
 
 insert into res_company (id, name, partner_id, currency_id, create_date) VALUES (1, 'My Company', 1, 1, now() at time zone 'UTC');
 insert into ir_model_data (name, module, model, noupdate, res_id) VALUES ('main_company', 'base', 'res.company', true, 1);
-select setval('res_company_id_seq', 2);
+select setval('res_company_id_seq', 1);
 
 insert into res_partner (id, name, company_id, create_date) VALUES (1, 'My Company', 1, now() at time zone 'UTC');
 insert into ir_model_data (name, module, model, noupdate, res_id) VALUES ('main_partner', 'base', 'res.partner', true, 1);
-select setval('res_partner_id_seq', 2);
+select setval('res_partner_id_seq', 1);
 
-insert into res_users (id, login, password, active, partner_id, company_id, create_date) VALUES (1, 'admin', 'admin', true, 1, 1, now() at time zone 'UTC');
+insert into res_users (id, login, password, active, partner_id, company_id, create_date) VALUES (1, '__system__', NULL, false, 1, 1, now() at time zone 'UTC');
 insert into ir_model_data (name, module, model, noupdate, res_id) VALUES ('user_root', 'base', 'res.users', true, 1);
-select setval('res_users_id_seq', 2);
+select setval('res_users_id_seq', 1);
 
 insert into res_groups (id, name) VALUES (1, 'Employee');
 insert into ir_model_data (name, module, model, noupdate, res_id) VALUES ('group_user', 'base', 'res.groups', true, 1);
-select setval('res_groups_id_seq', 2);
+select setval('res_groups_id_seq', 1);
diff --git a/odoo/addons/base/data/res_partner_data.xml b/odoo/addons/base/data/res_partner_data.xml
index f83a9dceab4..41872a10fa0 100644
--- a/odoo/addons/base/data/res_partner_data.xml
+++ b/odoo/addons/base/data/res_partner_data.xml
@@ -16,6 +16,13 @@
         </record>
 
         <record model="res.partner" id="base.partner_root">
+            <field name="name">System</field>
+            <field name="company_id" ref="main_company"/>
+            <field name="customer" eval="False"/>
+            <field name="active" eval="False"/>
+        </record>
+
+        <record model="res.partner" id="base.partner_admin">
             <field name="name">Administrator</field>
             <field name="company_id" ref="main_company"/>
             <field name="customer" eval="False"/>
diff --git a/odoo/addons/base/data/res_users_data.xml b/odoo/addons/base/data/res_users_data.xml
index 70482bf1893..b28572009ce 100644
--- a/odoo/addons/base/data/res_users_data.xml
+++ b/odoo/addons/base/data/res_users_data.xml
@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
+        <!-- user 1 is the technical admin user -->
         <record model="res.users" id="base.user_root">
             <field name="partner_id" ref="base.partner_root"/>
             <field name="company_id" ref="main_company"/>
             <field name="company_ids" eval="[(4, ref('main_company'))]"/>
             <field name="signature"><![CDATA[<span>-- <br/>
+System</span>]]></field>
+        </record>
+
+        <!-- user 2 is the human admin user -->
+        <record id="user_admin" model="res.users">
+            <field name="login">admin</field>
+            <field name="password">admin</field>
+            <field name="partner_id" ref="base.partner_admin"/>
+            <field name="company_id" ref="main_company"/>
+            <field name="company_ids" eval="[(4, ref('main_company'))]"/>
+            <field name="groups_id" eval="[(6,0,[])]"/>
+            <field name="signature"><![CDATA[<span>-- <br/>
 Administrator</span>]]></field>
         </record>
 
diff --git a/odoo/addons/base/data/res_users_demo.xml b/odoo/addons/base/data/res_users_demo.xml
index faee5b8f40b..38d6323ee28 100644
--- a/odoo/addons/base/data/res_users_demo.xml
+++ b/odoo/addons/base/data/res_users_demo.xml
@@ -40,6 +40,11 @@
         </record>
 
         <record model="res.partner" id="base.partner_root">
+            <field name="email">root@yourcompany.example.com</field>
+            <field name="tz">Europe/Brussels</field>
+        </record>
+
+        <record model="res.partner" id="base.partner_admin">
             <field name="name">Mitchell Stephens</field>
             <field name="company_name">YourCompany</field>
             <field name="street">215 Vine St</field>