diff --git a/src/main/java/fr/xephi/authme/SendMailSSL.java b/src/main/java/fr/xephi/authme/SendMailSSL.java
index 8c3eb732..9d85eb71 100644
--- a/src/main/java/fr/xephi/authme/SendMailSSL.java
+++ b/src/main/java/fr/xephi/authme/SendMailSSL.java
@@ -51,7 +51,7 @@ public class SendMailSSL {
         final String subject = Settings.getMailSubject;
         final String smtp = Settings.getmailSMTP;
         final String password = Settings.getmailPassword;
-        final String mailText = Settings.getMailText.replace("%playername%", auth.getNickname()).replace("%servername%", plugin.getServer().getServerName()).replace("%generatedpass%", newPass);
+        final String mailText = Settings.getMailText.replace("<playername />", auth.getNickname()).replace("<servername />", plugin.getServer().getServerName()).replace("<generatedpass />", newPass);
         final String mail = auth.getEmail();
         Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
 
diff --git a/src/main/resources/email.html b/src/main/resources/email.html
index 12f6cbd5..b092cc5d 100644
--- a/src/main/resources/email.html
+++ b/src/main/resources/email.html
@@ -1,16 +1,16 @@
 <h1>
-Dear %playername%,
+Dear <playername />,
 </h1>
 
 <p>
 This is your new AuthMe password for the server %servername%:
 
-%generatedpass%
+<generatedpass />
 
-%image%
+<image />
 
 Do not forget to change password after login!
-/changepassword %generatedpass% newPassword'
+/changepassword <generatedpass /> newPassword'
 
-See you on %servername%!
+See you on <servername />!
 </p>
\ No newline at end of file