diff --git a/src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java b/src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java
index 7ca904d15..bb38e9b0b 100644
--- a/src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java
+++ b/src/main/java/fr/xephi/authme/commands/ChangePasswordCommand.java
@@ -58,6 +58,10 @@ public class ChangePasswordCommand implements CommandExecutor {
             m.send(player, "password_error");
             return true;
         }
+        if (!args[1].matches(Settings.getPassRegex)) {
+            m.send(player, "password_error");
+            return true;
+        }
         try {
             String hashnew = PasswordSecurity.getHash(Settings.getPasswordHash, args[1], name);