diff --git a/addons/survey/data/survey_demo_quiz.xml b/addons/survey/data/survey_demo_quiz.xml
index f97ae7844da..e2b11c6fc32 100644
--- a/addons/survey/data/survey_demo_quiz.xml
+++ b/addons/survey/data/survey_demo_quiz.xml
@@ -9,7 +9,7 @@
         <field name="users_can_go_back" eval="False"/>
         <field name="scoring_type">scoring_with_answers</field>
         <field name="scoring_success_min">55</field>
-        <field name="questions_layout">page_per_section</field>
+        <field name="questions_layout">page_per_question</field>
         <field name="description" type="html">
 <p>This small quiz will test your knowledge about our Company. Be prepared !</p></field>
         <field name="background_image" type="base64" file="survey/static/src/img/survey_background.jpg"/>
@@ -28,13 +28,30 @@
     <record id="survey_demo_quiz_p1_q1" model="survey.question">
         <field name="survey_id" ref="survey_demo_quiz"/>
         <field name="sequence">2</field>
-        <field name="title">Where are you from ?</field>
+        <field name="title">What is your email ?</field>
         <field name="question_type">char_box</field>
         <field name="constr_mandatory" eval="True"/>
+        <field name="validation_email" eval="True"/>
+        <field name="save_as_email" eval="True"/>
     </record>
     <record id="survey_demo_quiz_p1_q2" model="survey.question">
         <field name="survey_id" ref="survey_demo_quiz"/>
         <field name="sequence">3</field>
+        <field name="title">What is your nickname ?</field>
+        <field name="question_type">char_box</field>
+        <field name="constr_mandatory" eval="True"/>
+        <field name="save_as_nickname" eval="True"/>
+    </record>
+    <record id="survey_demo_quiz_p1_q3" model="survey.question">
+        <field name="survey_id" ref="survey_demo_quiz"/>
+        <field name="sequence">4</field>
+        <field name="title">Where are you from ?</field>
+        <field name="question_type">char_box</field>
+        <field name="constr_mandatory" eval="True"/>
+    </record>
+    <record id="survey_demo_quiz_p1_q4" model="survey.question">
+        <field name="survey_id" ref="survey_demo_quiz"/>
+        <field name="sequence">5</field>
         <field name="title">How old are you ?</field>
         <field name="description" type="html"><p>Just to categorize your answers, don't worry.</p></field>
         <field name="question_type">numerical_box</field>
@@ -99,14 +116,14 @@
             <field name="sequence">1</field>
             <field name="value">Fruits</field>
             <field name="is_correct" eval="True"/>
-            <field name="answer_score">2</field>
+            <field name="answer_score">20</field>
         </record>
         <record id="survey_demo_quiz_p3_q1_sug2" model="survey.question.answer">
             <field name="question_id" ref="survey_demo_quiz_p3_q1"/>
             <field name="sequence">2</field>
             <field name="value">Vegetables</field>
             <field name="is_correct" eval="True"/>
-            <field name="answer_score">1</field>
+            <field name="answer_score">10</field>
         </record>
         <record id="survey_demo_quiz_p3_q1_sug3" model="survey.question.answer">
             <field name="question_id" ref="survey_demo_quiz_p3_q1"/>
@@ -129,7 +146,7 @@
             <field name="sequence">1</field>
             <field name="value">Bees</field>
             <field name="is_correct" eval="True"/>
-            <field name="answer_score">2</field>
+            <field name="answer_score">20</field>
         </record>
         <record id="survey_demo_quiz_p3_q2_sug2" model="survey.question.answer">
             <field name="question_id" ref="survey_demo_quiz_p3_q2"/>
@@ -158,24 +175,26 @@
             <field name="sequence">1</field>
             <field name="value">Apple Trees</field>
             <field name="is_correct" eval="True"/>
-            <field name="answer_score">2</field>
+            <field name="answer_score">20</field>
         </record>
         <record id="survey_demo_quiz_p3_q3_sug2" model="survey.question.answer">
             <field name="question_id" ref="survey_demo_quiz_p3_q3"/>
             <field name="sequence">2</field>
             <field name="value">Lemon Trees</field>
             <field name="is_correct" eval="True"/>
-            <field name="answer_score">1</field>
+            <field name="answer_score">10</field>
         </record>
         <record id="survey_demo_quiz_p3_q3_sug3" model="survey.question.answer">
             <field name="question_id" ref="survey_demo_quiz_p3_q3"/>
             <field name="sequence">3</field>
             <field name="value">Baobab Trees</field>
+            <field name="answer_score">-10</field>
         </record>
         <record id="survey_demo_quiz_p3_q3_sug4" model="survey.question.answer">
             <field name="question_id" ref="survey_demo_quiz_p3_q3"/>
             <field name="sequence">4</field>
             <field name="value">Cookies</field>
+            <field name="answer_score">-10</field>
         </record>
     <record id="survey_demo_quiz_p3_q4" model="survey.question">
         <field name="survey_id" ref="survey_demo_quiz"/>
@@ -193,24 +212,26 @@
             <field name="sequence">1</field>
             <field name="value">Pomelos</field>
             <field name="is_correct" eval="True"/>
-            <field name="answer_score">2</field>
+            <field name="answer_score">20</field>
         </record>
         <record id="survey_demo_quiz_p3_q4_sug2" model="survey.question.answer">
             <field name="question_id" ref="survey_demo_quiz_p3_q4"/>
             <field name="sequence">2</field>
             <field name="value">Grapefruits</field>
             <field name="is_correct" eval="True"/>
-            <field name="answer_score">2</field>
+            <field name="answer_score">20</field>
         </record>
         <record id="survey_demo_quiz_p3_q4_sug3" model="survey.question.answer">
             <field name="question_id" ref="survey_demo_quiz_p3_q4"/>
             <field name="sequence">3</field>
             <field name="value">Cosmic rays</field>
+            <field name="answer_score">-10</field>
         </record>
         <record id="survey_demo_quiz_p3_q4_sug4" model="survey.question.answer">
             <field name="question_id" ref="survey_demo_quiz_p3_q4"/>
             <field name="sequence">4</field>
             <field name="value">Bricks</field>
+            <field name="answer_score">-10</field>
         </record>
     <record id="survey_demo_quiz_p3_q5" model="survey.question">
         <field name="survey_id" ref="survey_demo_quiz"/>
diff --git a/addons/survey/data/survey_demo_quiz_userinput.xml b/addons/survey/data/survey_demo_quiz_userinput.xml
index 8c20468f290..1330bad2187 100644
--- a/addons/survey/data/survey_demo_quiz_userinput.xml
+++ b/addons/survey/data/survey_demo_quiz_userinput.xml
@@ -42,11 +42,23 @@
     	<field name="user_input_id" ref="survey_demo_quiz_answer_1"/>
     	<field name="question_id" ref="survey_demo_quiz_p1_q1"/>
         <field name="answer_type">char_box</field>
-    	<field name="value_char_box">Brussels</field>
+    	<field name="value_char_box">mark.brown23@example.com</field>
     </record>
     <record id="survey_demo_quiz_answer_1_p1_q2_l1" model="survey.user_input.line">
     	<field name="user_input_id" ref="survey_demo_quiz_answer_1"/>
     	<field name="question_id" ref="survey_demo_quiz_p1_q2"/>
+        <field name="answer_type">char_box</field>
+    	<field name="value_char_box">Mark Brown</field>
+    </record>
+    <record id="survey_demo_quiz_answer_1_p1_q3_l1" model="survey.user_input.line">
+    	<field name="user_input_id" ref="survey_demo_quiz_answer_1"/>
+    	<field name="question_id" ref="survey_demo_quiz_p1_q3"/>
+        <field name="answer_type">char_box</field>
+    	<field name="value_char_box">Brussels</field>
+    </record>
+    <record id="survey_demo_quiz_answer_1_p1_q4_l1" model="survey.user_input.line">
+    	<field name="user_input_id" ref="survey_demo_quiz_answer_1"/>
+    	<field name="question_id" ref="survey_demo_quiz_p1_q4"/>
         <field name="answer_type">numerical_box</field>
     	<field name="value_numerical_box">36</field>
     </record>
@@ -188,14 +200,26 @@
 
     <!-- Page 1: general informations -->
     <record id="survey_demo_quiz_answer_2_p1_q1_l1" model="survey.user_input.line">
+    	<field name="user_input_id" ref="survey_demo_quiz_answer_2"/>
+    	<field name="question_id" ref="survey_demo_quiz_p1_q1"/>
+        <field name="answer_type">char_box</field>
+    	<field name="value_char_box">admin@yourcompany.example.com</field>
+    </record>
+    <record id="survey_demo_quiz_answer_2_p1_q2_l1" model="survey.user_input.line">
+    	<field name="user_input_id" ref="survey_demo_quiz_answer_2"/>
+    	<field name="question_id" ref="survey_demo_quiz_p1_q2"/>
+        <field name="answer_type">char_box</field>
+    	<field name="value_char_box">Mitchell Admin</field>
+    </record>
+    <record id="survey_demo_quiz_answer_2_p1_q3_l1" model="survey.user_input.line">
         <field name="user_input_id" ref="survey_demo_quiz_answer_2"/>
-        <field name="question_id" ref="survey_demo_quiz_p1_q1"/>
+        <field name="question_id" ref="survey_demo_quiz_p1_q3"/>
         <field name="answer_type">char_box</field>
         <field name="value_char_box">Ottawa</field>
     </record>
-    <record id="survey_demo_quiz_answer_2_p1_q2_l1" model="survey.user_input.line">
+    <record id="survey_demo_quiz_answer_2_p1_q4_l1" model="survey.user_input.line">
         <field name="user_input_id" ref="survey_demo_quiz_answer_2"/>
-        <field name="question_id" ref="survey_demo_quiz_p1_q2"/>
+        <field name="question_id" ref="survey_demo_quiz_p1_q4"/>
         <field name="answer_type">numerical_box</field>
         <field name="value_numerical_box">48</field>
     </record>
@@ -330,14 +354,26 @@
 
     <!-- Page 1: general informations -->
     <record id="survey_demo_quiz_answer_3_p1_q1_l1" model="survey.user_input.line">
+    	<field name="user_input_id" ref="survey_demo_quiz_answer_3"/>
+    	<field name="question_id" ref="survey_demo_quiz_p1_q1"/>
+        <field name="answer_type">char_box</field>
+    	<field name="value_char_box">joel.willis63@example.com</field>
+    </record>
+    <record id="survey_demo_quiz_answer_3_p1_q2_l1" model="survey.user_input.line">
+    	<field name="user_input_id" ref="survey_demo_quiz_answer_3"/>
+    	<field name="question_id" ref="survey_demo_quiz_p1_q2"/>
+        <field name="answer_type">char_box</field>
+    	<field name="value_char_box">Joël Willis</field>
+    </record>
+    <record id="survey_demo_quiz_answer_3_p1_q3_l1" model="survey.user_input.line">
         <field name="user_input_id" ref="survey_demo_quiz_answer_3"/>
-        <field name="question_id" ref="survey_demo_quiz_p1_q1"/>
+        <field name="question_id" ref="survey_demo_quiz_p1_q3"/>
         <field name="answer_type">char_box</field>
         <field name="value_char_box">Brussels</field>
     </record>
-    <record id="survey_demo_quiz_answer_3_p1_q2_l1" model="survey.user_input.line">
+    <record id="survey_demo_quiz_answer_3_p1_q4_l1" model="survey.user_input.line">
         <field name="user_input_id" ref="survey_demo_quiz_answer_3"/>
-        <field name="question_id" ref="survey_demo_quiz_p1_q2"/>
+        <field name="question_id" ref="survey_demo_quiz_p1_q4"/>
         <field name="answer_type">numerical_box</field>
         <field name="value_numerical_box">28</field>
     </record>