diff --git a/pom.xml b/pom.xml
index a685afaa0..4294b7b9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>2.5.2</build.version>
+        <build.version>2.5.3</build.version>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <server.jars>${project.basedir}/lib</server.jars>
diff --git a/src/main/java/world/bentobox/bentobox/api/user/User.java b/src/main/java/world/bentobox/bentobox/api/user/User.java
index f9508eb37..7d0e4f12a 100644
--- a/src/main/java/world/bentobox/bentobox/api/user/User.java
+++ b/src/main/java/world/bentobox/bentobox/api/user/User.java
@@ -505,12 +505,6 @@ public class User implements MetaDataAble {
     private String replacePrefixes(String translation, String[] variables) {
         for (String prefix : plugin.getLocalesManager().getAvailablePrefixes(this)) {
             String prefixTranslation = getTranslation("prefixes." + prefix);
-            // Replace the [gamemode] text variable
-            prefixTranslation = prefixTranslation.replace("[gamemode]",
-                    addon != null ? addon.getDescription().getName() : "[gamemode]");
-            // Replace the [friendly_name] text variable
-            prefixTranslation = prefixTranslation.replace("[friendly_name]",
-                    isPlayer() ? plugin.getIWM().getFriendlyName(getWorld()) : "[friendly_name]");
 
             // Replace the prefix in the actual message
             translation = translation.replace("[prefix_" + prefix + "]", prefixTranslation);
@@ -530,6 +524,16 @@ public class User implements MetaDataAble {
         if (player != null) {
             translation = plugin.getPlaceholdersManager().replacePlaceholders(player, translation);
         }
+
+        // Replace game mode and friendly name in general
+        // Replace the [gamemode] text variable
+        translation = translation.replace("[gamemode]",
+                addon != null ? addon.getDescription().getName() : "[gamemode]");
+        if (getWorld() != null) {
+            // Replace the [friendly_name] text variable
+            translation = translation.replace("[friendly_name]",
+                    isPlayer() ? plugin.getIWM().getFriendlyName(getWorld()) : "[friendly_name]");
+        }
         return translation;
     }
 
diff --git a/src/test/java/world/bentobox/bentobox/api/user/UserTest.java b/src/test/java/world/bentobox/bentobox/api/user/UserTest.java
index 5a93797dd..1500e5f46 100644
--- a/src/test/java/world/bentobox/bentobox/api/user/UserTest.java
+++ b/src/test/java/world/bentobox/bentobox/api/user/UserTest.java
@@ -119,11 +119,16 @@ public class UserTest {
         // Player
         when(player.getServer()).thenReturn(server);
         when(server.getOnlinePlayers()).thenReturn(Collections.emptySet());
+        @NonNull
+        World world = mock(World.class);
+        when(world.getName()).thenReturn("BSkyBlock");
+        when(player.getWorld()).thenReturn(world);
 
         // IWM
         when(plugin.getIWM()).thenReturn(iwm);
         // Addon
-        when(iwm .getAddon(any())).thenReturn(Optional.empty());
+        when(iwm.getAddon(any())).thenReturn(Optional.empty());
+        when(iwm.getFriendlyName(world)).thenReturn("BSkyBlock-Fiendly");
 
         user = User.getInstance(player);
 
@@ -930,7 +935,7 @@ public class UserTest {
         when(addon.getDescription()).thenReturn(new Builder("main", "gameAddon", "1.0").build());
         p.setAddon(addon);
         p.getTranslation(TEST_TRANSLATION);
-        verify(addon).getDescription();
+        verify(addon, times(2)).getDescription();
     }
 
     /**