diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 2a5eaad6..7e3a2603 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -6,7 +6,6 @@ import com.github.Anon8281.universalScheduler.UniversalScheduler;
 import com.github.Anon8281.universalScheduler.scheduling.schedulers.TaskScheduler;
 import fr.xephi.authme.api.v3.AuthMeApi;
 import fr.xephi.authme.command.CommandHandler;
-import fr.xephi.authme.command.TabCompleteHandler;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.DataFolder;
 import fr.xephi.authme.initialization.DataSourceProvider;
@@ -58,7 +57,6 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Objects;
 import java.util.Scanner;
 import java.util.function.Consumer;
 import java.util.logging.Level;
@@ -210,8 +208,8 @@ public class AuthMe extends JavaPlugin {
         }
         //detect server brand with classloader
         checkServerType();
-        Objects.requireNonNull(getCommand("register")).setTabCompleter(new TabCompleteHandler());
-        Objects.requireNonNull(getCommand("login")).setTabCompleter(new TabCompleteHandler());
+//        Objects.requireNonNull(getCommand("register")).setTabCompleter(new TabCompleteHandler());
+//        Objects.requireNonNull(getCommand("login")).setTabCompleter(new TabCompleteHandler());
         logger.info("AuthMeReReloaded is enabled successfully!");
         // Purge on start if enabled
         PurgeService purgeService = injector.getSingleton(PurgeService.class);
diff --git a/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java b/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java
index 65594657..dab5b513 100644
--- a/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java
+++ b/src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java
@@ -88,9 +88,9 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess {
         final PlayerAuth auth = playerCache.getAuth(name);
 
         // AuthMeReReloaded start - Fix #57
-//        if (isFirstLogin) {
-//            auth.setQuitLocation(player.getLocation());
-//        }
+        if (isFirstLogin) {
+            auth.setQuitLocation(player.getLocation());
+        }
         // AuthMeReReloaded end - Fix #57
 
         teleportationService.teleportOnLogin(player, auth, limbo);