diff --git a/src/main/java/fr/xephi/authme/security/HashAlgorithm.java b/src/main/java/fr/xephi/authme/security/HashAlgorithm.java
index 5ce3e92a..9c9ff919 100644
--- a/src/main/java/fr/xephi/authme/security/HashAlgorithm.java
+++ b/src/main/java/fr/xephi/authme/security/HashAlgorithm.java
@@ -34,7 +34,7 @@ public enum HashAlgorithm {
 
     @Deprecated DOUBLEMD5(fr.xephi.authme.security.crypts.DoubleMd5.class),
     @Deprecated MD5(fr.xephi.authme.security.crypts.Md5.class),
-    @Deprecated PLAINTEXT(fr.xephi.authme.security.crypts.PlainText.class),
+    @Deprecated PLAINTEXT(null),
     @Deprecated SHA1(fr.xephi.authme.security.crypts.Sha1.class),
     @Deprecated SHA512(fr.xephi.authme.security.crypts.Sha512.class),
     @Deprecated WHIRLPOOL(fr.xephi.authme.security.crypts.Whirlpool.class);
diff --git a/src/main/java/fr/xephi/authme/security/crypts/PlainText.java b/src/main/java/fr/xephi/authme/security/crypts/PlainText.java
deleted file mode 100644
index 43d6e820..00000000
--- a/src/main/java/fr/xephi/authme/security/crypts/PlainText.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package fr.xephi.authme.security.crypts;
-
-import fr.xephi.authme.security.crypts.description.Recommendation;
-import fr.xephi.authme.security.crypts.description.Usage;
-
-/**
- * Plaintext password storage.
- *
- * @deprecated Using this is no longer supported. AuthMe will migrate to SHA256 on startup.
- */
-@Deprecated
-@Recommendation(Usage.DEPRECATED)
-public class PlainText extends UnsaltedMethod {
-
-    @Override
-    public String computeHash(String password) {
-        return password;
-    }
-
-}
diff --git a/src/test/java/fr/xephi/authme/security/HashAlgorithmIntegrationTest.java b/src/test/java/fr/xephi/authme/security/HashAlgorithmIntegrationTest.java
index bba4f968..5b835194 100644
--- a/src/test/java/fr/xephi/authme/security/HashAlgorithmIntegrationTest.java
+++ b/src/test/java/fr/xephi/authme/security/HashAlgorithmIntegrationTest.java
@@ -81,7 +81,7 @@ public class HashAlgorithmIntegrationTest {
 
         // when
         for (HashAlgorithm hashAlgorithm : HashAlgorithm.values()) {
-            if (hashAlgorithm != HashAlgorithm.CUSTOM) {
+            if (hashAlgorithm != HashAlgorithm.CUSTOM && hashAlgorithm != HashAlgorithm.PLAINTEXT) {
                 boolean isEnumDeprecated = HashAlgorithm.class.getDeclaredField(hashAlgorithm.name())
                     .isAnnotationPresent(Deprecated.class);
                 boolean isDeprecatedClass = hashAlgorithm.getClazz().isAnnotationPresent(Deprecated.class);