diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommand.java
index a446a4e9..ec2b7d98 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/ChangePasswordAdminCommand.java
@@ -27,12 +27,7 @@ public class ChangePasswordAdminCommand implements ExecutableCommand {
 
         // Validate the password
         String playerPassLowerCase = playerPass.toLowerCase();
-        // TODO #308: Remove this check
-        if (playerPassLowerCase.contains("delete") || playerPassLowerCase.contains("where")
-            || playerPassLowerCase.contains("insert") || playerPassLowerCase.contains("modify")
-            || playerPassLowerCase.contains("from") || playerPassLowerCase.contains("select")
-            || playerPassLowerCase.contains(";") || playerPassLowerCase.contains("null")
-            || !playerPassLowerCase.matches(Settings.getPassRegex)) {
+        if (!playerPassLowerCase.matches(Settings.getPassRegex)) {
             commandService.send(sender, MessageKey.PASSWORD_MATCH_ERROR);
             return;
         }
diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java
index 640cdb8b..46916b7b 100644
--- a/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java
@@ -27,12 +27,7 @@ public class RegisterAdminCommand implements ExecutableCommand {
         final String playerPassLowerCase = playerPass.toLowerCase();
 
         // Command logic
-        // TODO #308: Remove the check for SQL keywords
-        if (playerPassLowerCase.contains("delete") || playerPassLowerCase.contains("where")
-            || playerPassLowerCase.contains("insert") || playerPassLowerCase.contains("modify")
-            || playerPassLowerCase.contains("from") || playerPassLowerCase.contains("select")
-            || playerPassLowerCase.contains(";") || playerPassLowerCase.contains("null")
-            || !playerPassLowerCase.matches(Settings.getPassRegex)) {
+        if (!playerPassLowerCase.matches(Settings.getPassRegex)) {
             commandService.send(sender, MessageKey.PASSWORD_MATCH_ERROR);
             return;
         }
diff --git a/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java b/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
index ca3639c0..0d1cdc48 100644
--- a/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
+++ b/src/main/java/fr/xephi/authme/command/executable/changepassword/ChangePasswordCommand.java
@@ -32,12 +32,7 @@ public class ChangePasswordCommand extends PlayerCommand {
 
         // Make sure the password is allowed
         String playerPassLowerCase = newPassword.toLowerCase();
-        // TODO #308: Remove SQL keywords check
-        if (playerPassLowerCase.contains("delete") || playerPassLowerCase.contains("where")
-            || playerPassLowerCase.contains("insert") || playerPassLowerCase.contains("modify")
-            || playerPassLowerCase.contains("from") || playerPassLowerCase.contains("select")
-            || playerPassLowerCase.contains(";") || playerPassLowerCase.contains("null")
-            || !playerPassLowerCase.matches(Settings.getPassRegex)) {
+        if (!playerPassLowerCase.matches(Settings.getPassRegex)) {
             commandService.send(player, MessageKey.PASSWORD_MATCH_ERROR);
             return;
         }