diff --git a/addons/event/__manifest__.py b/addons/event/__manifest__.py
index b71e33db688..e4b21a6930c 100644
--- a/addons/event/__manifest__.py
+++ b/addons/event/__manifest__.py
@@ -34,7 +34,9 @@ Key Features
         'views/res_partner_views.xml',
     ],
     'demo': [
+        'data/res_users_demo.xml',
         'data/event_demo.xml',
+        'data/event_registration_demo.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/event/data/event_demo.xml b/addons/event/data/event_demo.xml
index a8db6afd5d0..3b6385ce406 100644
--- a/addons/event/data/event_demo.xml
+++ b/addons/event/data/event_demo.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0"?>
 <odoo>
     <data>
-    <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4, ref('event.group_event_user'))]"/>
-     </record>
 
     <!-- Event Type -->
     <record id="event_type_0" model="event.type">
         <field name="name">Exhibition</field>
         <field name="use_mail_schedule" eval="False"/>
+        <field name="auto_confirm" eval="False"/>
     </record>
     <record id="event_type_1" model="event.type">
         <field name="name">Training</field>
         <field name="use_mail_schedule" eval="True"/>
+        <field name="auto_confirm" eval="True"/>
     </record>
     <record id="event_type_2" model="event.type">
         <field name="name">Sport</field>
@@ -22,15 +21,40 @@
     <!-- Event -->
     <record id="event_0" model="event.event">
         <field name="name">Design Fair Los Angeles</field>
-        <field name="user_id" ref="base.user_admin"/>
-        <field eval="(DateTime.now() + timedelta(days=1)).strftime('%Y-%m-%d 08:00:00')" name="date_begin"/>
-        <field eval="(DateTime.now() + timedelta(days=5)).strftime('%Y-%m-%d 18:00:00')" name="date_end"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field name="date_begin" eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d 08:00:00')"/>
+        <field name="date_end" eval="(DateTime.now() + timedelta(days=6)).strftime('%Y-%m-%d 18:00:00')"/>
         <field name="seats_availability">limited</field>
-        <field name="seats_max">500</field>
+        <field name="seats_max">50</field>
         <field name="address_id" ref="base.res_partner_1"/>
+        <field name="date_tz">US/Pacific</field>
         <field name="event_type_id" ref="event_type_0"/>
+        <field name="auto_confirm" eval="False"/>
+        <field name="twitter_hashtag">DesignFairLA</field>
         <field name="stage_id" ref="event_stage_booked"/>
     </record>
+    <record id="event_0_ticket_0" model="event.event.ticket">
+        <field name="name">Free</field>
+        <field name="description">Free entrance, no food !</field>
+        <field name="event_id" ref="event.event_0"/>
+        <field name="start_sale_date" eval="(DateTime.today() - timedelta(days=5)).strftime('%Y-%m-%d')"/>
+        <field name="end_sale_date" eval="(DateTime.today() + timedelta(days=5)).strftime('%Y-%m-%d')"/>
+        <field name="seats_max">0</field>
+    </record>
+    <record id="event_0_ticket_1" model="event.event.ticket">
+        <field name="name">Standard</field>
+        <field name="description">For only 10, you gain access to catering. Yum yum.</field>
+        <field name="event_id" ref="event.event_0"/>
+        <field name="end_sale_date" eval="(DateTime.today() + timedelta(days=2)).strftime('%Y-%m-%d')"/>
+        <field name="seats_max">50</field>
+    </record>
+    <record id="event_0_ticket_2" model="event.event.ticket">
+        <field name="name">VIP</field>
+        <field name="description">You are truly among the best.</field>
+        <field name="event_id" ref="event.event_0"/>
+        <field name="end_sale_date" eval="(DateTime.today() + timedelta(days=3)).strftime('%Y-%m-%d')"/>
+        <field name="seats_max">10</field>
+    </record>
 
     <record id="event.event_1" model="event.event">
         <field name="name">Great Reno Ballon Race</field>
@@ -54,6 +78,18 @@
         <field name="seats_max">200</field>
         <field name="stage_id" ref="event_stage_booked"/>
     </record>
+    <record id="event_2_ticket_1" model="event.event.ticket">
+        <field name="name">Standard</field>
+        <field name="event_id" ref="event.event_2"/>
+        <field name="end_sale_date" eval="(DateTime.today() + timedelta(90)).strftime('%Y-%m-%d')"/>
+        <field name="seats_max">50</field>
+    </record>
+    <record id="event_2_ticket_2" model="event.event.ticket">
+        <field name="name">VIP</field>
+        <field name="event_id" ref="event.event_2"/>
+        <field name="end_sale_date" eval="(DateTime.today() + timedelta(60)).strftime('%Y-%m-%d')"/>
+        <field name="seats_max">5</field>
+    </record>
 
     <record id="event.event_3" model="event.event">
         <field name="name">Live Music Festival</field>
@@ -66,15 +102,26 @@
         <field name="stage_id" ref="event_stage_announced"/>
     </record>
 
+    <!-- EVENT_4: very limited, intended to test seats reservation -->
     <record id="event.event_4" model="event.event">
         <field name="name">Business workshops</field>
         <field name="user_id" ref="base.user_admin"/>
-        <field eval="(DateTime.today()+ timedelta(days=50)).strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
-        <field eval="(DateTime.today()+ timedelta(days=50)).strftime('%Y-%m-%d 22:30:00')" name="date_end"/>
-        <field name="event_type_id" ref="event_type_1"/>
+        <field name="date_begin" eval="(DateTime.today()+ timedelta(days=50)).strftime('%Y-%m-%d 18:00:00')"/>
+        <field name="date_end" eval="(DateTime.today()+ timedelta(days=50)).strftime('%Y-%m-%d 22:30:00')"/>
+        <field name="seats_availability">limited</field>
+        <field name="seats_max">4</field>
         <field name="address_id" ref="base.res_partner_4"/>
+        <field name="date_tz">US/Pacific</field>
+        <field name="event_type_id" ref="event_type_1"/>
+        <field name="auto_confirm" eval="True"/>
         <field name="stage_id" ref="event_stage_announced"/>
     </record>
+    <record id="event_4_ticket_0" model="event.event.ticket">
+        <field name="name">General Admission</field>
+        <field name="event_id" ref="event.event_4"/>
+        <field name="end_sale_date" eval="(DateTime.today() + timedelta(30)).strftime('%Y-%m-%d')"/>
+        <field name="seats_max">4</field>
+    </record>
 
     <record id="event.event_5" model="event.event">
         <field name="name">Hockey Tournament</field>
@@ -94,13 +141,5 @@
         <field name="address_id" ref="base.res_partner_1"/>
     </record>
 
-    <!-- Attendee -->
-    <record id="reg_2_0" model="event.registration">
-        <field name="name">Camptocamp</field>
-        <field name="email">odoo@camptocamp.com</field>
-        <field name="phone">+41 21 619 10 04 </field>
-        <field name="event_id" ref="event_2"/>
-        <field name="partner_id" ref="base.res_partner_12"/>
-    </record>
     </data>
 </odoo>
diff --git a/addons/event/data/event_registration_demo.xml b/addons/event/data/event_registration_demo.xml
new file mode 100644
index 00000000000..e3b3b8a0ec1
--- /dev/null
+++ b/addons/event/data/event_registration_demo.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<odoo><data>
+
+    <record id="event_registration_0_0" model="event.registration">
+        <field name="event_id" ref="event.event_0"/>
+        <field name="event_ticket_id" ref="event.event_0_ticket_1"/>
+        <field name="partner_id" ref="base.res_partner_address_1"/>
+    </record>
+    <record id="event_registration_0_1" model="event.registration">
+        <field name="event_id" ref="event.event_0"/>
+        <field name="event_ticket_id" ref="event.event_0_ticket_1"/>
+        <field name="partner_id" ref="base.res_partner_address_2"/>
+    </record>
+    <record id="event_registration_0_2" model="event.registration">
+        <field name="event_id" ref="event.event_0"/>
+        <field name="event_ticket_id" ref="event.event_0_ticket_0"/>
+        <field name="name">Tucker Carlson</field>
+        <field name="name">tuck@test.example.com</field>
+        <field name="partner_id" eval="False"/>
+    </record>
+
+    <record id="event_registration_4_0" model="event.registration">
+        <field name="event_id" ref="event.event_4"/>
+        <field name="event_ticket_id" ref="event.event_4_ticket_0"/>
+        <field name="partner_id" ref="base.res_partner_address_7"/>
+    </record>
+    <record id="event_registration_4_1" model="event.registration">
+        <field name="event_id" ref="event.event_4"/>
+        <field name="event_ticket_id" ref="event.event_4_ticket_0"/>
+        <field name="partner_id" ref="base.res_partner_address_13"/>
+    </record>
+    <record id="event_registration_4_2" model="event.registration">
+        <field name="event_id" ref="event.event_4"/>
+        <field name="event_ticket_id" ref="event.event_4_ticket_0"/>
+        <field name="partner_id" ref="base.res_partner_address_14"/>
+    </record>
+
+    <function model="event.registration"
+        name="action_confirm"
+        eval="[[ref('event_registration_0_0'), ref('event_registration_0_1'),
+                ref('event_registration_4_0'), ref('event_registration_4_1'), ref('event_registration_4_2')]]"
+    />
+
+</data></odoo>
\ No newline at end of file
diff --git a/addons/event/data/res_users_demo.xml b/addons/event/data/res_users_demo.xml
new file mode 100644
index 00000000000..04cd8668c93
--- /dev/null
+++ b/addons/event/data/res_users_demo.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="base.user_demo" model="res.users">
+        <field name="groups_id" eval="[(4, ref('event.group_event_user'))]"/>
+    </record>
+ </odoo>
\ No newline at end of file
diff --git a/addons/event_sale/data/event_demo.xml b/addons/event_sale/data/event_demo.xml
index 6ce4d91dfd6..f11a1dfdeec 100644
--- a/addons/event_sale/data/event_demo.xml
+++ b/addons/event_sale/data/event_demo.xml
@@ -1,48 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <record id="event_0_ticket_1" model="event.event.ticket">
-        <field name="name">Standard</field>
-        <field name="event_id" ref="event.event_0"/>
+    <record id="event.event_0_ticket_0" model="event.event.ticket">
+        <field name="product_id" ref="product_product_event"/>
+        <field name="price">0</field>
+    </record>
+    <record id="event.event_0_ticket_1" model="event.event.ticket">
         <field name="product_id" ref="product_product_event"/>
-        <field name="end_sale_date" eval="(DateTime.today() + timedelta(90)).strftime('%Y-%m-%d')"/>
         <field name="price">1000.0</field>
-        <field name="seats_max">50</field>
     </record>
-
-    <record id="event_0_ticket_2" model="event.event.ticket">
-        <field name="name">VIP</field>
-        <field name="event_id" ref="event.event_0"/>
+    <record id="event.event_0_ticket_2" model="event.event.ticket">
         <field name="product_id" ref="product_product_event"/>
-        <field name="end_sale_date" eval="(DateTime.today() + timedelta(60)).strftime('%Y-%m-%d')"/>
         <field name="price">1500.0</field>
-        <field name="seats_max">10</field>
     </record>
 
-    <record id="event_4_ticket_1" model="event.event.ticket">
-        <field name="name">General Admission</field>
-        <field name="event_id" ref="event.event_4"/>
+    <record id="event.event_2_ticket_1" model="event.event.ticket">
+        <field name="product_id" ref="product_product_event"/>
+        <field name="price">1000.0</field>
+    </record>
+    <record id="event.event_2_ticket_2" model="event.event.ticket">
+        <field name="product_id" ref="product_product_event"/>
+        <field name="price">1500.0</field>
+    </record>
+
+    <record id="event.event_4_ticket_0" model="event.event.ticket">
         <field name="product_id" ref="product_product_event"/>
-        <field name="end_sale_date" eval="(DateTime.today() + timedelta(30)).strftime('%Y-%m-%d')"/>
         <field name="price">99.0</field>
-        <field name="seats_max">100</field>
     </record>
 
-    <record id="event_2_ticket_1" model="event.event.ticket">
-        <field name="name">Standard</field>
-        <field name="event_id" ref="event.event_2"/>
-        <field name="product_id" ref="product_product_event"/>
-        <field name="end_sale_date" eval="(DateTime.today() + timedelta(90)).strftime('%Y-%m-%d')"/>
-        <field name="price">1000.0</field>
-        <field name="seats_max">50</field>
-    </record>
-
-    <record id="event_2_ticket_2" model="event.event.ticket">
-        <field name="name">VIP</field>
-        <field name="event_id" ref="event.event_2"/>
-        <field name="product_id" ref="product_product_event"/>
-        <field name="end_sale_date" eval="(DateTime.today() + timedelta(60)).strftime('%Y-%m-%d')"/>
-        <field name="price">1500.0</field>
-        <field name="seats_max">5</field>
-    </record>
 </odoo>
diff --git a/addons/website_event_questions/__manifest__.py b/addons/website_event_questions/__manifest__.py
index 3a67ac7fa15..b4cddc33bc4 100644
--- a/addons/website_event_questions/__manifest__.py
+++ b/addons/website_event_questions/__manifest__.py
@@ -12,5 +12,9 @@
         'report/report_event_question_view.xml',
         'security/ir.model.access.csv',
     ],
+    'demo': [
+        'data/event_demo.xml',
+        'data/event_registration_demo.xml',
+    ],
     'installable': True,
 }
diff --git a/addons/website_event_questions/data/event_demo.xml b/addons/website_event_questions/data/event_demo.xml
new file mode 100644
index 00000000000..59f500e3f01
--- /dev/null
+++ b/addons/website_event_questions/data/event_demo.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+    <record id="event_0_question_0" model="event.question">
+        <field name="title">Meal Type</field>
+        <field name="is_individual" eval="False"/>
+        <field name="event_id" ref="event.event_0"/>
+    </record>
+    <record id="event_0_question_0_answer_0" model="event.answer">
+        <field name="name">Mixed</field>
+        <field name="sequence">1</field>
+        <field name="question_id" ref="website_event_questions.event_0_question_0"/>
+    </record>
+    <record id="event_0_question_0_answer_1" model="event.answer">
+        <field name="name">Vegetarian</field>
+        <field name="sequence">2</field>
+        <field name="question_id" ref="website_event_questions.event_0_question_0"/>
+    </record>
+    <record id="event_0_question_0_answer_2" model="event.answer">
+        <field name="name">Pastafarian</field>
+        <field name="sequence">3</field>
+        <field name="question_id" ref="website_event_questions.event_0_question_0"/>
+    </record>
+</data></odoo>
\ No newline at end of file
diff --git a/addons/website_event_questions/data/event_registration_demo.xml b/addons/website_event_questions/data/event_registration_demo.xml
new file mode 100644
index 00000000000..ac9c894d250
--- /dev/null
+++ b/addons/website_event_questions/data/event_registration_demo.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data>
+    <record id="event.event_registration_0_0" model="event.registration">
+        <field name="answer_ids" eval="[
+            (5, 0),
+            (4, ref('website_event_questions.event_0_question_0_answer_0'))]"/>
+    </record>
+    <record id="event.event_registration_0_1" model="event.registration">
+        <field name="answer_ids" eval="[
+            (5, 0),
+            (4, ref('website_event_questions.event_0_question_0_answer_1'))]"/>
+    </record>
+    <record id="event.event_registration_0_2" model="event.registration">
+        <field name="answer_ids" eval="[
+            (5, 0),
+            (4, ref('website_event_questions.event_0_question_0_answer_2'))]"/>
+    </record>
+</data></odoo>
\ No newline at end of file