diff --git a/scheduler_error_mailer/data/ir_cron_email_tpl.xml b/scheduler_error_mailer/data/ir_cron_email_tpl.xml
index 6635d080a..53f8efd09 100644
--- a/scheduler_error_mailer/data/ir_cron_email_tpl.xml
+++ b/scheduler_error_mailer/data/ir_cron_email_tpl.xml
@@ -1,46 +1,44 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data noupdate="1">
-        <!-- Error Email template  -->
-        <record id="scheduler_error_mailer" model="mail.template">
-            <field name="name">Scheduler Error</field>
-            <field name="email_from">${object.user_id.email or ''}</field>
-            <field name="email_to">${object.user_id.email or ''}</field>
-            <field
-                name="subject"
-            >[DB ${ctx.get('dbname')}] Scheduler '${object.name or ''}' FAILED</field>
-            <field name="model_id" ref="base.model_ir_cron" />
-            <field name="auto_delete" eval="True" />
-            <field name="body_html">
+<odoo noupdate="1">
+    <!-- Error Email template  -->
+    <record id="scheduler_error_mailer" model="mail.template">
+        <field name="name">Scheduler Error</field>
+        <field name="email_from">{{object.user_id.email or ''}}</field>
+        <field name="email_to">{{object.user_id.email or ''}}</field>
+        <field
+            name="subject"
+        >[DB {{ctx.get('dbname')}}] Scheduler '{{object.name or ''}}' FAILED</field>
+        <field name="model_id" ref="base.model_ir_cron" />
+        <field name="auto_delete" eval="True" />
+        <field name="body_html">
                 <![CDATA[
 <div style="font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
 
-<p>Odoo tried to run the scheduler <em>${object.name or ''}</em> in the database <em>${ctx.get('dbname')}</em> but it failed. Here is the error message :</p>
+<p>Odoo tried to run the scheduler <em><t t-out="object.name or ''"/></em> in the database <em><t t-out="ctx.get('dbname')"/></em> but it failed. Here is the error message :</p>
 
 <strong>
-${ctx.get('job_exception') or 'Failed to get the error message from the context.'}
+<t t-out="ctx.get('job_exception') or 'Failed to get the error message from the context.'"/>
 </strong>
 
 <p>You may check the logs of the Odoo server to get more information about this failure.</p>
 
-<p>Properties of the scheduler <em>${object.name or ''}</em> :</p>
+<p>Properties of the scheduler <em><t t-out="object.name or ''"/></em> :</p>
 <ul>
-<li>Model : ${object.model_id.name or ''}</li>
-<li>Python code : <code>${object.code or ''}</code></li>
-<li>Interval : ${object.interval_number or '0'} ${object.interval_type or ''}</li>
-<li>Number of calls : ${object.numbercall or '0'}</li>
-<li>Repeat missed : ${object.doall}</li>
-<li>User : ${object.user_id.name or ''}</li>
+<li>Model : <t t-out="object.model_id.name or ''"/></li>
+<li>Python code : <code><t t-out="object.code or ''"/></code></li>
+<li>Interval : <t t-out="object.interval_number or '0'"/> <t t-out="object.interval_type or ''"/></li>
+<li>Number of calls : <t t-out="object.numbercall or '0'"/></li>
+<li>Repeat missed : <t t-out="object.doall"/></li>
+<li>User : <t t-out="object.user_id.name or ''"/></li>
 </ul>
 
 <p>
 -- <br/>
 Automatic e-mail sent by Odoo. Do not reply.<br/>
-Database : ${ctx.get('dbname')}
+Database : <t t-out="ctx.get('dbname')"/>
 </p>
 </div>
     ]]>
-            </field>
-        </record>
-    </data>
+        </field>
+    </record>
 </odoo>
diff --git a/scheduler_error_mailer/demo/ir_cron_demo.xml b/scheduler_error_mailer/demo/ir_cron_demo.xml
index d7b10fb66..cb850e036 100644
--- a/scheduler_error_mailer/demo/ir_cron_demo.xml
+++ b/scheduler_error_mailer/demo/ir_cron_demo.xml
@@ -6,24 +6,22 @@
   Copyright (C) 2018 bloopark systems (<http://bloopark.de>)
   The licence is in the file __openerp__.py
 -->
-<odoo>
-    <data noupdate="1">
-        <record id="test_scheduler_error_mailer" model="ir.cron">
-            <field name="name">Test Scheduler Error Mailer</field>
-            <field name="active" eval="False" />
-            <field name="user_id" ref="base.user_root" />
-            <field name="interval_number">1</field>
-            <field name="interval_type">hours</field>
-            <field name="numbercall">-1</field>
-            <!-- don't limit the number of calls -->
-            <field name="doall" eval="True" />
-            <field name="model_id" ref="model_ir_cron" />
-            <field name="state">code</field>
-            <field name="code">model._test_scheduler_failure()</field>
-            <field
-                name="email_template_id"
-                ref="scheduler_error_mailer.scheduler_error_mailer"
-            />
-        </record>
-    </data>
+<odoo noupdate="1">
+    <record id="test_scheduler_error_mailer" model="ir.cron">
+        <field name="name">Test Scheduler Error Mailer</field>
+        <field name="active" eval="False" />
+        <field name="user_id" ref="base.user_root" />
+        <field name="interval_number">1</field>
+        <field name="interval_type">hours</field>
+        <field name="numbercall">-1</field>
+        <!-- don't limit the number of calls -->
+        <field name="doall" eval="True" />
+        <field name="model_id" ref="model_ir_cron" />
+        <field name="state">code</field>
+        <field name="code">model._test_scheduler_failure()</field>
+        <field
+            name="email_template_id"
+            ref="scheduler_error_mailer.scheduler_error_mailer"
+        />
+    </record>
 </odoo>
diff --git a/scheduler_error_mailer/models/ir_cron.py b/scheduler_error_mailer/models/ir_cron.py
index 7756af433..eeb289873 100644
--- a/scheduler_error_mailer/models/ir_cron.py
+++ b/scheduler_error_mailer/models/ir_cron.py
@@ -16,6 +16,7 @@ class IrCron(models.Model):
 
     email_template_id = fields.Many2one(
         comodel_name="mail.template",
+        domain=[("model_id.model", "=", "ir.cron")],
         string="Error E-mail Template",
         help="Select the email template that will be sent when "
         "this scheduler fails.",
@@ -37,7 +38,7 @@ class IrCron(models.Model):
 
             _logger.debug("Sending scheduler error email with context=%s", context)
 
-            template = my_cron.email_template_id.with_context(context).sudo()
+            template = my_cron.email_template_id.with_context(**context).sudo()
             template.send_mail(my_cron.id, force_send=True)
 
         return res