diff --git a/src/main/java/fr/xephi/authme/command/CommandInitializer.java b/src/main/java/fr/xephi/authme/command/CommandInitializer.java
index e0a7f94ef..40646d2a8 100644
--- a/src/main/java/fr/xephi/authme/command/CommandInitializer.java
+++ b/src/main/java/fr/xephi/authme/command/CommandInitializer.java
@@ -380,8 +380,8 @@ public final class CommandInitializer {
             .labels("changepassword", "changepass", "cp")
             .description("Change password Command")
             .detailedDescription("Command to change your password using AuthMeReloaded.")
-            .withArgument("password", "Password", false)
-            .withArgument("verifyPassword", "Verify password.", false)
+            .withArgument("oldPassword", "Old Password", false)
+            .withArgument("newPassword", "New Password.", false)
             .permissions(ALLOWED, PlayerPermission.CHANGE_PASSWORD)
             .executableCommand(new ChangePasswordCommand())
             .build();
diff --git a/src/main/resources/email.html b/src/main/resources/email.html
index b092cc5da..a2a7ed060 100644
--- a/src/main/resources/email.html
+++ b/src/main/resources/email.html
@@ -3,14 +3,16 @@ Dear <playername />,
 </h1>
 
 <p>
-This is your new AuthMe password for the server %servername%:
-
+This is your new AuthMe password for the server <servername />:
+</p>
+<p>
 <generatedpass />
-
+</p>
 <image />
-
-Do not forget to change password after login!
+<p>
+Do not forget to change password after login!<br />
 /changepassword <generatedpass /> newPassword'
-
+</p>
+<p>
 See you on <servername />!
 </p>
\ No newline at end of file