diff --git a/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java b/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java
index 3a2eca41..221496b3 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java
@@ -21,7 +21,7 @@ public final class PluginSettings implements SettingsHolder {
 
     @Comment({
         "Send i18n messages to player based on their client settings, this option will override `settings.messagesLanguage`",
-        "(Requires Protocollib if server version under 1.15.2)",
+        "(Requires Protocollib or Packetevents)",
         "This will not affect language of AuthMe help command."
     })
     public static final Property<Boolean> I18N_MESSAGES =
diff --git a/src/main/java/fr/xephi/authme/util/message/I18NUtils.java b/src/main/java/fr/xephi/authme/util/message/I18NUtils.java
index 4883a0f0..63235e14 100644
--- a/src/main/java/fr/xephi/authme/util/message/I18NUtils.java
+++ b/src/main/java/fr/xephi/authme/util/message/I18NUtils.java
@@ -52,7 +52,7 @@ public class I18NUtils {
                     return PLAYER_LOCALE.get(player.getUniqueId());
                 }
 
-                if (System.currentTimeMillis() - startTime  > 3000) {
+                if (System.currentTimeMillis() - startTime  > 500) {
                     return null;
                 }
             }