diff --git a/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java b/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
index 605e020c3..2a4820cee 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java
@@ -4,6 +4,7 @@ import java.util.Collections;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -105,6 +106,24 @@ public class JoinLeaveListener implements Listener {
 
         // Add a player to the bStats cache.
         plugin.getMetrics().ifPresent(bStats -> bStats.addPlayer(playerUUID));
+
+        // Create onIsland placeholders
+        plugin.getAddonsManager().getGameModeAddons().forEach(addon -> {
+            plugin.getPlaceholdersManager()
+                    .registerPlaceholder(addon.getDescription().getName() + "_onisland_" + user.getName(), asker -> {
+                        if (asker == null) {
+                            return "";
+                        }
+                        // Get the user who this applies to
+                        User named = User.getInstance(user.getUniqueId());
+                        if (named.isOnline()) {
+                            return plugin.getIslands().getIslands(addon.getOverWorld(), asker).stream()
+                                    .filter(island -> island.onIsland(named.getLocation())).findFirst().map(i -> "true")
+                                    .orElse("false");
+                        }
+                        return "false";
+                    });
+        });
     }
 
     private void firstTime(User user) {
diff --git a/src/main/java/world/bentobox/bentobox/lists/GameModePlaceholder.java b/src/main/java/world/bentobox/bentobox/lists/GameModePlaceholder.java
index 5677b3c89..032617d26 100644
--- a/src/main/java/world/bentobox/bentobox/lists/GameModePlaceholder.java
+++ b/src/main/java/world/bentobox/bentobox/lists/GameModePlaceholder.java
@@ -19,6 +19,7 @@ import world.bentobox.bentobox.util.Util;
 
 /**
  * Common Game Mode Placeholders
+ * All of these are prefixed with the game mode's name, e.g., bskykblock_
  */
 public enum GameModePlaceholder {