diff --git a/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java b/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java
index 4f973294e..8c853828f 100644
--- a/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java
+++ b/src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java
@@ -81,8 +81,11 @@ public class LimboCache {
             PlayerData data = cache.get(lowerName);
             player.setOp(data.isOperator());
             player.setAllowFlight(data.isCanFly());
-            player.setWalkSpeed(data.getWalkSpeed());
-            player.setFlySpeed(data.getFlySpeed());
+            //player.setWalkSpeed(data.getWalkSpeed());
+            //player.setFlySpeed(data.getFlySpeed());
+            // FIXME: this is a temp fix!
+            player.setWalkSpeed(0.2f);
+            player.setFlySpeed(0.2f);
             restoreGroup(player, data.getGroup());
             data.clearTasks();
         }
diff --git a/src/main/java/fr/xephi/authme/listener/PlayerListener.java b/src/main/java/fr/xephi/authme/listener/PlayerListener.java
index 8906f9260..c498e6ecc 100644
--- a/src/main/java/fr/xephi/authme/listener/PlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/PlayerListener.java
@@ -145,10 +145,6 @@ public class PlayerListener implements Listener {
         if (!settings.getProperty(RestrictionSettings.ALLOW_UNAUTHED_MOVEMENT)) {
             // "cancel" the event
             event.setTo(event.getFrom());
-            if (settings.getProperty(RestrictionSettings.REMOVE_SPEED)) {
-                player.setFlySpeed(0.0f);
-                player.setWalkSpeed(0.0f);
-            }
             return;
         }
 
diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
index c8347139e..056ae36cd 100644
--- a/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
@@ -8,7 +8,6 @@ import fr.xephi.authme.mail.SendMailSSL;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.process.AsynchronousProcess;
-import fr.xephi.authme.process.Management;
 import fr.xephi.authme.process.ProcessService;
 import fr.xephi.authme.process.SyncProcessManager;
 import fr.xephi.authme.security.HashAlgorithm;