diff --git a/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java b/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
index 78c1fddf7..4197cb686 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
@@ -9,9 +9,12 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.localization.TextVariables;
 import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.lists.Flags;
 import world.bentobox.bentobox.managers.PlayersManager;
+import world.bentobox.bentobox.util.Util;
 
 public class JoinLeaveListener implements Listener {
 
@@ -43,6 +46,26 @@ public class JoinLeaveListener implements Listener {
             plugin.getIWM().getOverWorlds().stream()
             .filter(w -> event.getPlayer().getLastPlayed() < plugin.getIWM().getResetEpoch(w))
             .forEach(w -> players.setResets(w, playerUUID, 0));
+
+            // Update the island range of the islands the player owns
+            plugin.getIWM().getOverWorlds().stream()
+                    .filter(world -> plugin.getIslands().isOwner(world, user.getUniqueId()))
+                    .forEach(world -> {
+                        Island island = plugin.getIslands().getIsland(world, user);
+
+                        // Check if new leader has a different range permission than the island size
+                        int range = user.getPermissionValue(plugin.getIWM().getAddon(island.getWorld()).get().getPermissionPrefix() + "island.range", plugin.getIWM().getIslandProtectionRange(Util.getWorld(island.getWorld())));
+
+                        // Range can go up or down
+                        if (range != island.getProtectionRange()) {
+                            user.sendMessage("commands.admin.setrange.range-updated", TextVariables.NUMBER, String.valueOf(range));
+                            plugin.log("Makeleader: Island protection range changed from " + island.getProtectionRange() + " to "
+                                    + range + " for " + user.getName() + " due to permission.");
+                        }
+
+                        island.setProtectionRange(range);
+                    });
+
             // Set the player's name (it may have changed), but only if it isn't empty
             if (!user.getName().isEmpty()) {
                 players.setPlayerName(user);
@@ -50,6 +73,8 @@ public class JoinLeaveListener implements Listener {
             } else {
                 plugin.logWarning("Player that just logged in has no name! " + playerUUID.toString());
             }
+
+            // If mobs have to be removed when a player joins, then wipe all the mobs on his island.
             if (plugin.getIWM().inWorld(user.getLocation()) && Flags.REMOVE_MOBS.isSetForWorld(user.getWorld())) {
                 plugin.getIslands().clearArea(user.getLocation());
             }