diff --git a/data/mail_end_training.xml b/data/mail_end_training.xml
index d94693a33d5eb249a9d8de7a26de75413acc671b..0f81cc42a6ebbfc067d47092b40fabe38235e36d 100644
--- a/data/mail_end_training.xml
+++ b/data/mail_end_training.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
      <record id="mail_template_training_end" model="mail.template">
-         <field name="name">Formation - AECT</field>
+         <field name="name">Formation - Fin de formation</field>
          <field name="model_id" ref="training.model_training_student" />
-         <field name="subject">Formation {{ object.training_id.program_id.name }} - Questionnaire AECT</field>
+         <field name="subject">Formation {{ object.training_id.program_id.name }} - Questionnaire et attestation</field>
          <field name="email_from">{{ object.training_id.company_id.training_user_contact.login }} &lt;{{ object.training_id.company_id.training_user_contact.name }}&gt;</field>
          <field name="email_to">{{ (object.partner_id.email or object.email) }}</field>
-         <field name="description">Mail envoyé au stagiaire pour le questionnaire AECT</field>
+         <field name="description">Mail envoyé au stagiaire pour les questionnaires finaux et l'atteastation</field>
          <field name="body_html" type="html">
             <div style="margin: 0px; padding: 0px; font-size: 13px;">
                 <p style="margin: 0px; padding: 0px; font-size: 13px;">
@@ -29,20 +29,22 @@
                         </ul>
                     </t>
                     <br />
-                    je vous adresse
-                    <span t-if="env.context.get('satisfaction_answer')">les liens vers deux formulaires </span>
-                    <span t-else="">le lien vers le formulaire </span>
-                    en ligne que vous voudrez bien renseigner :
-                    <ul>
-                        <li>
-                            <a t-att-href="env.context.get('aect_answer').get_start_url()">Autoévaluation des compétences terminales</a>
-                        </li>
-                        <li t-if="env.context.get('satisfaction_answer')">
-                            <a t-att-href="env.context.get('satisfaction_answer').get_start_url()">Evaluation de ta satisfaction</a>
-                        </li>
-                    </ul>
-                    <br /><br />
-                    Je vous prie de bien vouloir trouver en pièce jointe ton <t t-out="object.get_certification_name()" />
+                    <t t-if="env.context.get('satisfaction_answer') or env.context.get('aect_answer')">
+                        Je vous adresse
+                        <span t-if="env.context.get('satisfaction_answer') and env.context.get('aect_answer')">les liens vers deux formulaires </span>
+                        <span t-else="">le lien vers le formulaire </span>
+                        en ligne que vous voudrez bien renseigner :
+                        <ul>
+                            <li t-if="env.context.get('aect_answer')">
+                                <a t-att-href="env.context.get('aect_answer').get_start_url()">Autoévaluation des compétences terminales</a>
+                            </li>
+                            <li t-if="env.context.get('satisfaction_answer')">
+                                <a t-att-href="env.context.get('satisfaction_answer').get_start_url()">Evaluation de ta satisfaction</a>
+                            </li>
+                        </ul>
+                        <br /><br />
+                    </t>
+                    Je vous prie de bien vouloir trouver en pièce jointe votre <t t-out="object.get_certification_name()" />
                     <br /><br />
                     Je vous remercie et vous souhaite bonne réception de ce courriel.
                     <br />
diff --git a/models/res_company.py b/models/res_company.py
index c4b499310a096557e68aece81745bf5524d39469..b83d95fec17ca28ed01521a19bea28b4dce36c3c 100644
--- a/models/res_company.py
+++ b/models/res_company.py
@@ -54,7 +54,7 @@ class ResCompany(models.Model):
 
     def _get_end_training_email(self):
         self.ensure_one()
-        if self.aeci_mail_template_id:
-            return self.aeci_mail_template_id
+        if self.end_mail_template_id:
+            return self.end_mail_template_id
         else:
             return self.env.ref("training_survey.mail_template_training_end")
diff --git a/models/training.py b/models/training.py
index c10d2598e28764d162c368902d141b0f70f73640..b9b072be1ae960d20ddb108583c4ab2587248ec4 100644
--- a/models/training.py
+++ b/models/training.py
@@ -125,16 +125,23 @@ class Training(models.Model):
             )
         )
         for student in student_ids:
-            aect_answer = student._create_answer(self.aect_survey_id)
-            satisfaction_answer = student._create_answer(self.satisfaction_survey_id)
+            aect_answer = satisfaction_answer = False
+            subject = "Attestation"
+            if self.aect_survey_id:
+                aect_answer = student._create_answer(self.aect_survey_id)
+                subject += " - AECT"
+            if self.satisfaction_survey_id:
+                satisfaction_answer = student._create_answer(self.satisfaction_survey_id)
+                subject += " - Satisfaction"
+
             end_template_id.with_context(
-                aect_answer=aect_answer, satisfaction_answer=satisfaction_answer
+                aect_answer=aect_answer, satisfaction_answer=satisfaction_answer, subject=subject
             ).send_mail(
                 student.id,
                 email_layout_xmlid="training.mail_training_layout",
             )
         self.message_post(
-            subject=_("Questionnaires AECT et Satisfaction envoyés"),
+            subject=subject,
             body=f"Participants : {', '.join(student_ids.mapped('partner_id.name'))}",
         )