diff --git a/__manifest__.py b/__manifest__.py
index e58fa391b1a67b9c078d7db872ce6b41c49d51c9..73bb0b4c1eec3852fa9e0cc134a1f9f57bd358d4 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -11,5 +11,6 @@
         'templates/assets.xml',
         'templates/layout.xml',
         'views/survey_views.xml',
+        'views/subtype_views.xml',
     ],
 }
diff --git a/models/survey_survey.py b/models/survey_survey.py
index f55ede5f10ca17f233a412f4890291762829e966..e5e0fcae85cf17258657d71d85d7fc1400d2ed75 100644
--- a/models/survey_survey.py
+++ b/models/survey_survey.py
@@ -28,6 +28,15 @@ class Survey(models.Model):
     background_image = fields.Binary('Image de fond')
     type_id = fields.Many2one('survey.type', string="Type", required=True)
     product_id = fields.Many2one('survey.product', string="Produit", required=True)
+    stage_id = fields.Many2one('survey.stage', track_visibility='onchange')
+    is_button_display = fields.Boolean("Afficher le bouton enregistrer")
+    is_mail_auto = fields.Boolean("Envoi du mail automatique")
+
+    def _track_subtype(self, init_values):
+        self.ensure_one()
+        if (('stage_id' in init_values) and (self.stage_id.name == "Fermé")):
+            return 'ethikis_survey.survey_state_change'
+        return super(Survey, self)._track_subtype(init_values)
 
 
 class SurveyQuestion(models.Model):
@@ -46,9 +55,24 @@ class SurveyLabel(models.Model):
     num_question = fields.Char("Numéro de question")
 
 
+class SurveyUserInputLine(models.Model):
+    _inherit = "survey.user_input"
+
+    stage_id = fields.Many2one('survey.stage', string="Etape du sondage", related='survey_id.stage_id', store=True, readonly=False)
+
+    @api.onchange('state')
+    def on_change_state(self):
+        if self.state == 'done':
+            if self.survey_id.is_mail_auto:
+                return
+                # Envoi du mail automatique
+
+
 class SurveyUserInput(models.Model):
     _inherit = "survey.user_input"
 
+    stage_id = fields.Many2one('survey.stage', string="Etape du sondage", related='survey_id.stage_id', store=True, readonly=False)
+
     @api.multi
     def action_reopen_survey(self):
         """ Passer le sondage à state=skip """
diff --git a/templates/layout.xml b/templates/layout.xml
index 690de14505d30bb927d07237453454945871f48d..3c98d7f24d7d02228e5d1e33131402d804aeb106 100644
--- a/templates/layout.xml
+++ b/templates/layout.xml
@@ -149,7 +149,7 @@
             <xpath expr="//form//div[@class='text-center mt16 mb16']" position="replace">
                 <div class="text-right mt16 mb16 mr32">
                     <button t-if="survey.users_can_go_back and page_nr > 0" type="submit" class="btn ethikis-btn-green" name="button_submit" value="previous">Previous page</button>
-                    <button t-if="not last" type="submit" class="btn ethikis-btn-blue" name="button_submit" value="save_quit">Save or continue</button>
+                    <button t-if="not last and survey.is_button_display" type="submit" class="btn ethikis-btn-blue" name="button_submit" value="save_quit">Save or continue</button>
                     <button t-if="not last" type="submit" class="btn ethikis-btn-blue" name="button_submit" value="next">Next page</button>
                     <button t-if="last" type="submit" class="btn ethikis-btn-blue" name="button_submit" value="finish">Submit survey</button>
                 </div>
@@ -184,7 +184,6 @@
                             <div t-if='survey.quizz_mode'>You scored <t t-esc="user_input.quizz_score" /> points.</div>
                             <div><a class="final_links" t-att-href="'/survey/print/%s/%s' % (slug(survey), token)">Check answers</a></div>
                             <div><a class="final_links" href="https://longtimelabel.com">Know more about LONGTIME</a></div>
-                            <div><a class="final_links" href="https://ethikis.com">Our ethical tools</a></div>
                         </div>
                     </div>
                 </div>
diff --git a/views/subtype_views.xml b/views/subtype_views.xml
new file mode 100644
index 0000000000000000000000000000000000000000..34c9264ab0e974ba4d1225fe4e5a00e9c9e954ec
--- /dev/null
+++ b/views/subtype_views.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- Copyright 2021 Le Filament
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+	<record id="survey_state_change" model="mail.message.subtype">
+	    <field name="name">Suivi du sondage</field>
+	    <field name="res_model">survey.survey</field>
+	    <field name="default" eval="True"/>
+	    <field name="description">Suivi du sondage</field>
+	</record>
+</odoo>
\ No newline at end of file
diff --git a/views/survey_views.xml b/views/survey_views.xml
index a3a1687fd386df0d0e5875535fd26ea183e4f29a..030cc1f9c31beb91a882c1f1e64f9d1079cddc0b 100644
--- a/views/survey_views.xml
+++ b/views/survey_views.xml
@@ -36,6 +36,11 @@
                 </page>
             </xpath>
 
+            <xpath expr="//notebook//page//group//field[@name='users_can_go_back']" position="after">
+                <field name="is_button_display" />
+                <field name="is_mail_auto" />
+            </xpath>
+
             <xpath expr="//div[hasclass('oe_title')]" position="after">
                 <group>
                     <field name="product_id" />