diff --git a/templates/mail/send_authentication_token.tt2.html b/templates/mail/send_authentication_token.tt2.html
index e29f23cc6daf3c9cc9445a38fce055d672d055f1..aab6482b5a7a491311b935ae01a0ed7bd2eb0218 100644
--- a/templates/mail/send_authentication_token.tt2.html
+++ b/templates/mail/send_authentication_token.tt2.html
@@ -1,9 +1,9 @@
 <p>
     [% lh.maketext("This is an email challenge automatically sent to you by [_1].", app.name) %] 
 [% IF user && idp %]
-    [% lh.maketext("User [_1], authenticated by Identity Provider [_2], has requested creation of test accounts for Service Provider [_3].", user, idp.entityid, sp.entityid) %]
+    [% lh.maketext("User [_1], authenticated by Identity Provider [_2], has requested creation of test accounts for Service Provider [_3].", user, idp.entityid, sp.entityid) %] 
 [% ELSE %]
-    [% lh.maketext("Somebody has requested creation of test accounts for service provider [_1], from IP address [_2].", sp.entityid, source_ip) %]
+    [% lh.maketext("Somebody has requested creation of test accounts for service provider [_1], from IP address [_2].", sp.entityid, source_ip) %] 
 [% END %]
     [% lh.maketext("The address [_1] is mentioned in the federation metadata as a contact for this Service Provider.", to) %]
 </p>
diff --git a/templates/mail/send_authentication_token.tt2.txt b/templates/mail/send_authentication_token.tt2.txt
index bda58be84201d7b480c2b7485baafda5c711670b..4178da32fcf6dc69fecb78d97af1f53fcfa3c9f1 100644
--- a/templates/mail/send_authentication_token.tt2.txt
+++ b/templates/mail/send_authentication_token.tt2.txt
@@ -2,7 +2,7 @@
 [% IF user && idp %]
 [% lh.maketext("User [_1], authenticated by Identity Provider [_2], has requested creation of test accounts for Service Provider [_3].", user, idp.entityid, sp.entityid) %] 
 [% ELSE %]
-[% lh.maketext("Somebody has requested creation of test accounts for service provider [_1], from IP address [_2].", sp.entityid, source_ip) %]
+[% lh.maketext("Somebody has requested creation of test accounts for service provider [_1], from IP address [_2].", sp.entityid, source_ip) %] 
 [% END %]
 [% lh.maketext("The address [_1] is mentioned in the federation metadata as a contact for this Service Provider.", to) %]