diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 1675b092b3f..5e665bde848 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -17,42 +17,41 @@
         <field name="name">Interview</field>
     </record>
 
-<!-- Templates DATA for  refuse and approve -->
+    <!-- Templates for approval / refusing applicants -->
     <record id="email_template_refuse_applicant" model="email.template">
-        <field name="name">Refuse Application</field>
-        <field name="email_from">${user.email or ''}</field>
-        <field name="subject">We refuse your application</field>
+        <field name="name">Application refused</field>
+        <field name="subject">Application refused</field>
         <field name="email_to">${object.email_from}</field>
-        <field name="lang">${object.lang}</field>
+        <field name="partner_id">${object.partner_id and object.partner_id.id or ''}</field>
+        <field name="lang">${object.partner_id and object.partner_id.lang or ''}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
-        <field eval="0" name="user_signature"/>
-        <field name="body_html"><![CDATA[<p>Dear Applicant,</p>
+        <field name="user_signature" eval="0"/>
+        <field name="body_html"><![CDATA[<p>Dear ${object.partner_name},</p>
         <p>We thank you for your interest in our company and for your application.
-        Unfortunately, your profile does not match with our needs or our recruitment campaign has reached its term.</p>
+        Unfortunately, your profile does not match with our needs or our recruitment
+        campaign has reached its term.</p>
         <p>If you want more details, feel free to contact us by phone.</p>
         <p>Kind regards,</p>
         <br/>
-         ${object.user_id.signature}
-        <br/>]]></field>
+         ${object.user_id and object.user_id.signature or ''}]]></field>
     </record>
 
     <record id="email_template_approve_applicant" model="email.template">
-        <field name="name">Interested in Application</field>
-        <field name="email_from">${user.email or ''}</field>
+        <field name="name">Application approved</field>
+        <field name="subject">Application approved</field>
         <field name="email_to">${object.email_from}</field>
-        <field name="subject">We are interested in your application</field>
-        <field name="lang">${object.lang}</field>
+        <field name="partner_id">${object.partner_id and object.partner_id.id or ''}</field>
+        <field name="lang">${object.partner_id and object.partner_id.lang or ''}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
-        <field eval="0" name="user_signature"/>
-        <field name="body_html"><![CDATA[<p>Dear Applicant,</p>
+        <field name="user_signature" eval="0"/>
+        <field name="body_html"><![CDATA[<p>Dear ${object.partner_name},</p>
         <p>Congrats! Your resume's got our interest!
         I will call you as soon as possible to make a 10 minutes phone interview and  plan a first meeting.</p>
         <p>If we can’t reach you or if you miss our call, feel free to reach me back on the number 001 312 349 3030
         If I do not answer, please let me a message with some schedules to call you back.</p>
         <p>Kind regards,</p>
         <br/>
-         ${object.user_id.signature}
-        <br/>]]></field>
+         ${object.user_id.signature}]]></field>
     </record>
 
         <!--    HR Recruitment Source        -->