diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 59d1589e7ff..72337ac31af 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -18,7 +18,7 @@
     </record>
 
     <!-- Templates for approval / refusing applicants -->
-    <record id="email_template_refuse_applicant" model="email.template">
+    <record id="applicant_refuse" model="email.template">
         <field name="name">Application refused</field>
         <field name="subject">Application refused</field>
         <field name="email_to">${object.email_from}</field>
@@ -26,7 +26,7 @@
         <field name="lang">${object.partner_id and object.partner_id.lang or ''}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
         <field name="user_signature" eval="0"/>
-        <field name="body_html"><![CDATA[<p>Dear ${object.partner_name},</p>
+        <field name="body_html"><![CDATA[<p>Dear ${object.partner_name or 'applicant'},</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>
@@ -36,7 +36,7 @@
          ${object.user_id and object.user_id.signature or ''}]]></field>
     </record>
 
-    <record id="email_template_approve_applicant" model="email.template">
+    <record id="applicant_interest" model="email.template">
         <field name="name">Application approved</field>
         <field name="subject">Application approved</field>
         <field name="email_to">${object.email_from}</field>
@@ -44,7 +44,7 @@
         <field name="lang">${object.partner_id and object.partner_id.lang or ''}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
         <field name="user_signature" eval="0"/>
-        <field name="body_html"><![CDATA[<p>Dear ${object.partner_name},</p>
+        <field name="body_html"><![CDATA[<p>Dear ${object.partner_name or 'applicant'},</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
@@ -95,7 +95,7 @@
     </record>
     <record model="hr.recruitment.stage" id="stage_job2">
         <field name="name">First Interview</field>
-        <field name="template_id" ref="email_template_approve_applicant"/>
+        <field name="template_id" ref="applicant_interest"/>
         <field name="sequence">2</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job3">
@@ -114,7 +114,7 @@
     <record model="hr.recruitment.stage" id="stage_job6">
         <field name="name">Refused</field>
         <field name="sequence">6</field>
-        <field name="template_id" ref="email_template_refuse_applicant"/>
+        <field name="template_id" ref="applicant_refuse"/>
         <field name="fold" eval="True"/>
     </record>