diff --git a/P3D/HelperClasses/Localization.vb b/P3D/HelperClasses/Localization.vb
index 6baab9c03..871669236 100644
--- a/P3D/HelperClasses/Localization.vb
+++ b/P3D/HelperClasses/Localization.vb
@@ -88,6 +88,11 @@
 
                             If LocalizationTokens.ContainsKey(TokenName) = False Then
                                 LocalizationTokens.Add(TokenName, New Token(TokenContent, "en", IsGameModeFile))
+                            Else
+                                If LocalizationTokens(TokenName).IsGameModeToken = False And IsGameModeFile = True Then
+                                    LocalizationTokens.Remove(TokenName)
+                                    LocalizationTokens.Add(TokenName, New Token(TokenContent, LanguageSuffix, IsGameModeFile))
+                                End If
                             End If
                         End If
                     Next
diff --git a/P3D/World/Badge.vb b/P3D/World/Badge.vb
index e9a7b1be5..d66c1b533 100644
--- a/P3D/World/Badge.vb
+++ b/P3D/World/Badge.vb
@@ -111,7 +111,15 @@ Public Class Badge
         For Each b As BadgeDeclaration In Badges
             If b.ID = ID Then
                 If Localization.TokenExists("badge_" & b.ID.ToString) = True Then
-                    Return Localization.GetString("badge_" & b.ID.ToString, b.Name)
+                    If GameModeManager.ActiveGameMode.IsDefaultGamemode = False Then
+                        If Localization.LocalizationTokens("badge_" & b.ID.ToString).IsGameModeToken = False Then
+                            Return b.Name
+                        Else
+                            Return Localization.GetString("badge_" & b.ID.ToString)
+                        End If
+                    Else
+                        Return Localization.GetString("badge_" & b.ID.ToString)
+                    End If
                 Else
                     Return b.Name
                 End If