diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 37d574440..2fd5d9802 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -692,16 +692,21 @@ public class AuthMe extends JavaPlugin {
             if (Settings.protectInventoryBeforeLogInEnabled) {
                 ConsoleLogger.showError("WARNING!!! The protectInventory feature requires ProtocolLib! Disabling it...");
                 Settings.protectInventoryBeforeLogInEnabled = false;
+                getSettings().set("settings.restrictions.ProtectInventoryBeforeLogIn", false);
             }
             return;
         }
 
         if (Settings.protectInventoryBeforeLogInEnabled) {
-            inventoryProtector = new AuthMeInventoryPacketAdapter(this);
-            inventoryProtector.register();
-        } else if (inventoryProtector != null) {
-            ProtocolLibrary.getProtocolManager().removePacketListener(inventoryProtector);
-            inventoryProtector = null;
+            if (inventoryProtector == null) {
+                inventoryProtector = new AuthMeInventoryPacketAdapter(this);
+                inventoryProtector.register();
+            }
+        } else {
+            if (inventoryProtector != null) {
+                ProtocolLibrary.getProtocolManager().removePacketListener(inventoryProtector);
+                inventoryProtector = null;
+            }
         }
     }
 
diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java
index ad501994a..11ec0a39a 100644
--- a/src/main/java/fr/xephi/authme/settings/Settings.java
+++ b/src/main/java/fr/xephi/authme/settings/Settings.java
@@ -621,10 +621,6 @@ public final class Settings extends YamlConfiguration {
             set("Email.emailBlacklisted", new ArrayList<String>());
             changes = true;
         }
-        if (contains("Performances.useMultiThreading")) {
-            set("Performances.useMultiThreading", null);
-            changes = true;
-        }
         if (contains("Performances")) {
             set("Performances", null);
             changes = true;