diff --git a/src/main/java/fr/xephi/authme/data/limbo/WalkFlySpeedRestoreType.java b/src/main/java/fr/xephi/authme/data/limbo/WalkFlySpeedRestoreType.java
index 960cdd435..4f17d14e4 100644
--- a/src/main/java/fr/xephi/authme/data/limbo/WalkFlySpeedRestoreType.java
+++ b/src/main/java/fr/xephi/authme/data/limbo/WalkFlySpeedRestoreType.java
@@ -1,5 +1,6 @@
 package fr.xephi.authme.data.limbo;
 
+import fr.xephi.authme.ConsoleLogger;
 import org.bukkit.entity.Player;
 
 /**
@@ -8,56 +9,94 @@ import org.bukkit.entity.Player;
  */
 public enum WalkFlySpeedRestoreType {
 
-    /** Restores from LimboPlayer to Player. */
+    /**
+     * Restores from LimboPlayer to Player.
+     */
     RESTORE {
         @Override
         public void restoreFlySpeed(Player player, LimboPlayer limbo) {
+            ConsoleLogger.debug("Restoring fly speed for LimboPlayer " + player.getName() + " to "
+                + limbo.getFlySpeed() + " (RESTORE mode)");
             player.setFlySpeed(limbo.getFlySpeed());
         }
 
         @Override
         public void restoreWalkSpeed(Player player, LimboPlayer limbo) {
+            ConsoleLogger.debug("Restoring walk speed for LimboPlayer " + player.getName() + " to "
+                + limbo.getWalkSpeed() + " (RESTORE mode)");
             player.setWalkSpeed(limbo.getWalkSpeed());
         }
     },
 
-    /** Restores from LimboPlayer, using the default speed if the speed on LimboPlayer is 0. */
+    /**
+     * Restores from LimboPlayer, using the default speed if the speed on LimboPlayer is 0.
+     */
     RESTORE_NO_ZERO {
         @Override
         public void restoreFlySpeed(Player player, LimboPlayer limbo) {
             float limboFlySpeed = limbo.getFlySpeed();
-            player.setFlySpeed(limboFlySpeed > 0.01f ? limboFlySpeed : LimboPlayer.DEFAULT_FLY_SPEED);
+            if (limboFlySpeed > 0.01f) {
+                ConsoleLogger.debug("Restoring fly speed for LimboPlayer " + player.getName() + " to "
+                    + limboFlySpeed + " (RESTORE_NO_ZERO mode)");
+                player.setFlySpeed(limboFlySpeed);
+            } else {
+                ConsoleLogger.debug("Restoring fly speed for LimboPlayer " + player.getName()
+                    + " to DEFAULT, it was 0! (RESTORE_NO_ZERO mode)");
+                player.setFlySpeed(LimboPlayer.DEFAULT_FLY_SPEED);
+            }
         }
 
         @Override
         public void restoreWalkSpeed(Player player, LimboPlayer limbo) {
             float limboWalkSpeed = limbo.getWalkSpeed();
-            player.setWalkSpeed(limboWalkSpeed > 0.01f ? limboWalkSpeed : LimboPlayer.DEFAULT_WALK_SPEED);
+            if (limboWalkSpeed > 0.01f) {
+                ConsoleLogger.debug("Restoring walk speed for LimboPlayer " + player.getName() + " to "
+                    + limboWalkSpeed + " (RESTORE_NO_ZERO mode)");
+                player.setWalkSpeed(limboWalkSpeed);
+            } else {
+                ConsoleLogger.debug("Restoring walk speed for LimboPlayer " + player.getName() + ""
+                    + " to DEFAULT, it was 0! (RESTORE_NO_ZERO mode)");
+                player.setWalkSpeed(LimboPlayer.DEFAULT_WALK_SPEED);
+            }
         }
     },
 
-    /** Uses the max speed of Player (current speed) and the LimboPlayer. */
+    /**
+     * Uses the max speed of Player (current speed) and the LimboPlayer.
+     */
     MAX_RESTORE {
         @Override
         public void restoreFlySpeed(Player player, LimboPlayer limbo) {
-            player.setFlySpeed(Math.max(player.getFlySpeed(), limbo.getFlySpeed()));
+            float newSpeed = Math.max(player.getFlySpeed(), limbo.getFlySpeed());
+            ConsoleLogger.debug("Restoring fly speed for LimboPlayer " + player.getName() + " to " + newSpeed
+                + " (Current: " + player.getFlySpeed() + ", Limbo: " + limbo.getFlySpeed() + ") (MAX_RESTORE mode)");
+            player.setFlySpeed(newSpeed);
         }
 
         @Override
         public void restoreWalkSpeed(Player player, LimboPlayer limbo) {
-            player.setWalkSpeed(Math.max(player.getWalkSpeed(), limbo.getWalkSpeed()));
+            float newSpeed = Math.max(player.getWalkSpeed(), limbo.getWalkSpeed());
+            ConsoleLogger.debug("Restoring walk speed for LimboPlayer " + player.getName() + " to " + newSpeed
+                + " (Current: " + player.getWalkSpeed() + ", Limbo: " + limbo.getWalkSpeed() + ") (MAX_RESTORE mode)");
+            player.setWalkSpeed(newSpeed);
         }
     },
 
-    /** Always sets the default speed to the player. */
+    /**
+     * Always sets the default speed to the player.
+     */
     DEFAULT {
         @Override
         public void restoreFlySpeed(Player player, LimboPlayer limbo) {
+            ConsoleLogger.debug("Restoring fly speed for LimboPlayer " + player.getName()
+                + " to DEFAULT (DEFAULT mode)");
             player.setFlySpeed(LimboPlayer.DEFAULT_FLY_SPEED);
         }
 
         @Override
         public void restoreWalkSpeed(Player player, LimboPlayer limbo) {
+            ConsoleLogger.debug("Restoring walk speed for LimboPlayer " + player.getName()
+                + " to DEFAULT (DEFAULT mode)");
             player.setWalkSpeed(LimboPlayer.DEFAULT_WALK_SPEED);
         }
     };
@@ -66,7 +105,7 @@ public enum WalkFlySpeedRestoreType {
      * Restores the fly speed from Limbo to Player according to the restoration type.
      *
      * @param player the player to modify
-     * @param limbo the limbo player to read from
+     * @param limbo  the limbo player to read from
      */
     public abstract void restoreFlySpeed(Player player, LimboPlayer limbo);
 
@@ -74,7 +113,7 @@ public enum WalkFlySpeedRestoreType {
      * Restores the walk speed from Limbo to Player according to the restoration type.
      *
      * @param player the player to modify
-     * @param limbo the limbo player to read from
+     * @param limbo  the limbo player to read from
      */
     public abstract void restoreWalkSpeed(Player player, LimboPlayer limbo);