diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java
index ac20a9e7f..c4c8adc5c 100644
--- a/src/main/java/fr/xephi/authme/settings/Settings.java
+++ b/src/main/java/fr/xephi/authme/settings/Settings.java
@@ -64,7 +64,8 @@ public final class Settings {
         purgeLimitedCreative, purgeAntiXray, purgePermissions,
         enableProtection, enableAntiBot, recallEmail, useWelcomeMessage,
         broadcastWelcomeMessage, forceRegKick, forceRegLogin,
-        checkVeryGames, removeJoinMessage, removeLeaveMessage, delayJoinMessage, noTeleport, applyBlindEffect,
+        checkVeryGames, removeJoinMessage, removeLeaveMessage, delayJoinMessage,
+        noTeleport, applyBlindEffect, hideTablistBeforeLogin, denyTabcompleteBeforeLogin,
         kickPlayersBeforeStopping, allowAllCommandsIfRegIsOptional,
         customAttributes, generateImage, isRemoveSpeedEnabled, preventOtherCase;
     public static String getNickRegex, getUnloggedinGroup, getMySQLHost,
@@ -165,6 +166,9 @@ public final class Settings {
         enablePasswordConfirmation = configFile.getBoolean("settings.restrictions.enablePasswordConfirmation", true);
 
         protectInventoryBeforeLogInEnabled = configFile.getBoolean("settings.restrictions.ProtectInventoryBeforeLogIn", true);
+        denyTabcompleteBeforeLogin = configFile.getBoolean("settings.restrictions.DenyTabcompleteBeforeLogin", true);
+        hideTablistBeforeLogin = configFile.getBoolean("settings.restrictions.DenyTabcompleteBeforeLogin", true);
+
         plugin.checkProtocolLib();
 
         passwordMaxLength = configFile.getInt("settings.security.passwordMaxLength", 20);
diff --git a/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java b/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java
index e3af011ca..fe41709e1 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/RegistrationSettings.java
@@ -86,10 +86,10 @@ public class RegistrationSettings implements SettingsClass {
 
     // TODO: comments!
     public static final Property<Boolean> REMOVE_JOIN_MESSAGE =
-            newProperty("settings.removeJoinMessages", false);
+            newProperty("settings.removeJoinMessage", false);
 
     public static final Property<Boolean> REMOVE_LEAVE_MESSAGE =
-            newProperty("settings.removeLeaveMessages", false);
+            newProperty("settings.removeLeaveMessage", false);
 
     @Comment("Do we need to add potion effect Blinding before login/reigster?")
     public static final Property<Boolean> APPLY_BLIND_EFFECT =