diff --git a/plugin/src/main/java/com/alttd/cometskyblock/island/Island.java b/plugin/src/main/java/com/alttd/cometskyblock/island/Island.java
index 3a939dd..99554b9 100644
--- a/plugin/src/main/java/com/alttd/cometskyblock/island/Island.java
+++ b/plugin/src/main/java/com/alttd/cometskyblock/island/Island.java
@@ -134,6 +134,10 @@ public class Island extends YamlConfiguration {
 
     public void owner(UUID uuid) {
         set("island.owner", uuid.toString());
+        String islandName = islandName();
+        if ((islandName == null || islandName.isBlank()) && !uuid.equals(NILL_UUID)) {
+            islandName(Bukkit.getOfflinePlayer(uuid).getName() + "'s island");
+        }
         save();
     }
 
diff --git a/plugin/src/main/java/com/alttd/cometskyblock/island/IslandData.java b/plugin/src/main/java/com/alttd/cometskyblock/island/IslandData.java
index 5567b0c..094e752 100644
--- a/plugin/src/main/java/com/alttd/cometskyblock/island/IslandData.java
+++ b/plugin/src/main/java/com/alttd/cometskyblock/island/IslandData.java
@@ -74,6 +74,6 @@ public record IslandData(int islandId, String name, int level) {
     }
 
     public String format() {
-        return name + " - " + level;
+        return name == null ? "Unnamed Island" : name + " - " + level;
     }
 }