diff --git a/Cmdr/CmdrClient/CmdrInterface/Window.lua b/Cmdr/CmdrClient/CmdrInterface/Window.lua
index 2ee222fc..38b29ae9 100644
--- a/Cmdr/CmdrClient/CmdrInterface/Window.lua
+++ b/Cmdr/CmdrClient/CmdrInterface/Window.lua
@@ -26,7 +26,8 @@ Line.Parent = nil
 
 -- Update the text entry label
 function Window:UpdateLabel()
-	Entry.TextLabel.Text = Player.Name .. "@" .. self.Cmdr.PlaceName .. "$"
+	Entry.TextLabel.Text =
+		`{Player.Name}{if self.Cmdr.PlaceName and self.Cmdr.PlaceName ~= "" then `@{self.Cmdr.PlaceName}` else ""}$`
 end
 
 -- Get the text entry label