diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib
index e6e36c4..d2a6013 100644
Binary files a/Release/Plugins/RenX.Core.lib and b/Release/Plugins/RenX.Core.lib differ
diff --git a/RenX.Core/RenX_Functions.cpp b/RenX.Core/RenX_Functions.cpp
index 0a8e973..647815b 100644
--- a/RenX.Core/RenX_Functions.cpp
+++ b/RenX.Core/RenX_Functions.cpp
@@ -545,8 +545,7 @@ void RenX::initTranslations(Jupiter::INIFile &translationsFile)
 
 Jupiter::String RenX::getFormattedPlayerName(const RenX::PlayerInfo *player)
 {
-	Jupiter::String r;
-	if (player->isBot) r += IRCCOLOR "05[B]";
+	Jupiter::String r = player->formatNamePrefix;
 	r += IRCCOLOR;
 	r += RenX::getTeamColor(player->team);
 	r += player->name;
diff --git a/RenX.Core/RenX_PlayerInfo.h b/RenX.Core/RenX_PlayerInfo.h
index bc8dbc2..68301e2 100644
--- a/RenX.Core/RenX_PlayerInfo.h
+++ b/RenX.Core/RenX_PlayerInfo.h
@@ -61,6 +61,7 @@ namespace RenX
 		unsigned int loses = 0;
 		unsigned int beaconPlacements = 0;
 		
+		mutable Jupiter::StringS formatNamePrefix;
 		mutable int access = 0;
 		mutable Jupiter::INIFile varData; // This will be replaced later with a more dedicated type.
 	};
diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp
index 204a34e..79ed003 100644
--- a/RenX.Core/RenX_Server.cpp
+++ b/RenX.Core/RenX_Server.cpp
@@ -649,7 +649,8 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line)
 			r = new RenX::PlayerInfo();
 			r->id = id;
 			r->name = name;
-			r->isBot = isBot;
+			if (r->isBot = isBot)
+				r->formatNamePrefix = IRCCOLOR "05[B]";
 			r->joinTime = time(nullptr);
 			r->steamid = steamid;
 			r->ip = ip;