diff --git a/templates/mail/send_authentication_token.tt2.html b/templates/mail/send_authentication_token.tt2.html
new file mode 100644
index 0000000000000000000000000000000000000000..3849c4216b39fb4ad52333c6b461cf7f655c4e5f
--- /dev/null
+++ b/templates/mail/send_authentication_token.tt2.html
@@ -0,0 +1,12 @@
+<p>
+    [% lh.maketext("This is an email challenge automatically sent to you by eduGAIN Access Check.") %]
+    [% lh.maketext("Somebody with IP address [_1] has requested to create test accounts for eduGAIN Service Provider with entityID [_2].", sourceip, entityid) %]
+    [% lh.maketext("The address [_1] is mentioned in the eduGAIN metadata as a contact for this Service Provider.", to) %]
+</p>
+
+<p>[% lh.maketext("To complete the creation of test accounts, paste the following validation token in <a href=\"[_1]\">eduGAIN Access Check</a>: [_2].", challenge_url, token) %]</p>
+
+<p>[% lh.maketext("If the creation of test accounts was not initiated by you or a fellow administrator for the above Service Provider, please forward this email and contact [_1] to inform them about a potential abuse of the eduGAIN Access Check service.", app.support_email) %]</p>
+
+<p>[% lh.maketext("Best Regards") %]</p>
+<p>eduGAIN Access Check Bot</p>
diff --git a/templates/renater/mail/send_authentication_token.tt2.html b/templates/renater/mail/send_authentication_token.tt2.html
new file mode 100644
index 0000000000000000000000000000000000000000..3849c4216b39fb4ad52333c6b461cf7f655c4e5f
--- /dev/null
+++ b/templates/renater/mail/send_authentication_token.tt2.html
@@ -0,0 +1,12 @@
+<p>
+    [% lh.maketext("This is an email challenge automatically sent to you by eduGAIN Access Check.") %]
+    [% lh.maketext("Somebody with IP address [_1] has requested to create test accounts for eduGAIN Service Provider with entityID [_2].", sourceip, entityid) %]
+    [% lh.maketext("The address [_1] is mentioned in the eduGAIN metadata as a contact for this Service Provider.", to) %]
+</p>
+
+<p>[% lh.maketext("To complete the creation of test accounts, paste the following validation token in <a href=\"[_1]\">eduGAIN Access Check</a>: [_2].", challenge_url, token) %]</p>
+
+<p>[% lh.maketext("If the creation of test accounts was not initiated by you or a fellow administrator for the above Service Provider, please forward this email and contact [_1] to inform them about a potential abuse of the eduGAIN Access Check service.", app.support_email) %]</p>
+
+<p>[% lh.maketext("Best Regards") %]</p>
+<p>eduGAIN Access Check Bot</p>