diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener19.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener19.java
index f5a20277..f5b073cc 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener19.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener19.java
@@ -1,6 +1,9 @@
 package fr.xephi.authme.listener;
 
+import fr.xephi.authme.settings.NewSetting;
 import fr.xephi.authme.settings.SpawnLoader;
+import fr.xephi.authme.settings.properties.RestrictionSettings;
+
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -16,11 +19,20 @@ public class AuthMePlayerListener19 implements Listener {
     @Inject
     private SpawnLoader spawnLoader;
 
-    AuthMePlayerListener19() { }
+    @Inject
+    private NewSetting settings;
     
+    /* WTF was that? We need to check all the settings before moving the player to the spawn!
+     * 
+     * TODO: fixme please!
+     * 
     @EventHandler(priority = EventPriority.LOWEST)
     public void onPlayerSpawn(PlayerSpawnLocationEvent event) {
+        if(settings.getProperty(RestrictionSettings.NO_TELEPORT)) {
+            return;
+        }
         event.setSpawnLocation(spawnLoader.getSpawnLocation(event.getPlayer()));
     }
+    */
 
 }