diff --git a/addons/survey/data/mail_template_data.xml b/addons/survey/data/mail_template_data.xml
index 42ed3ee42f3..96506fb928a 100644
--- a/addons/survey/data/mail_template_data.xml
+++ b/addons/survey/data/mail_template_data.xml
@@ -2,7 +2,7 @@
 <odoo>
     <data noupdate="1">
         <record id="mail_template_user_input_invite" model="mail.template">
-            <field name="name">Survey: Send by email</field>
+            <field name="name">Survey: Invite</field>
             <field name="model_id" ref="model_survey_user_input" />
             <field name="subject">Participate to ${object.survey_id.title} survey</field>
             <field name="email_to">${(object.partner_id.email_formatted or object.email) |safe}</field>
@@ -39,9 +39,10 @@
 
         <!-- Certification Email template -->
         <record id="mail_template_certification" model="mail.template">
-            <field name="name">Certification: Send by email</field>
+            <field name="name">Survey: Send certification by email</field>
             <field name="model_id" ref="survey.model_survey_user_input"/>
             <field name="subject">Certification: ${object.survey_id.display_name}</field>
+            <field name="email_from">${(object.survey_id.create_uid.email_formatted or user.email_formatted or user.company_id.catchall) |safe}</field>
             <field name="email_to">${(object.partner_id.email_formatted or object.email) |safe}</field>
             <field name="body_html" type="xml">
                 <div style="background:#F0F0F0;color:#515166;padding:10px 0px;font-family:Arial,Helvetica,sans-serif;font-size:14px;">