diff --git a/src/main/java/fr/xephi/authme/service/TeleportationService.java b/src/main/java/fr/xephi/authme/service/TeleportationService.java
index cd91303d..4ff84d9d 100644
--- a/src/main/java/fr/xephi/authme/service/TeleportationService.java
+++ b/src/main/java/fr/xephi/authme/service/TeleportationService.java
@@ -142,12 +142,10 @@ public class TeleportationService implements Reloadable {
             logger.debug("Teleporting `{0}` to spawn because of 'force-spawn after login'", player.getName());
             teleportToSpawn(player, true);
         } else if (settings.getProperty(TELEPORT_UNAUTHED_TO_SPAWN)) {
-            if (settings.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION)) {
+            if (settings.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION) && auth.getQuitLocY() != 0 && player.hasPlayedBefore()) {
                 Location location = buildLocationFromAuth(player, auth);
-                if (player.hasPlayedBefore()) {
-                    logger.debug("Teleporting `{0}` after login, based on the player auth", player.getName());
-                    teleportBackFromSpawn(player, location);
-                }
+                logger.debug("Teleporting `{0}` after login, based on the player auth", player.getName());
+                teleportBackFromSpawn(player, location);
             } else if (limbo != null && limbo.getLocation() != null) {
                 logger.debug("Teleporting `{0}` after login, based on the limbo player", player.getName());
                 teleportBackFromSpawn(player, limbo.getLocation());