diff --git a/BigBaseV2/src/features/join_message.cpp b/BigBaseV2/src/features/join_message.cpp
index cbdf5d55..a4756281 100644
--- a/BigBaseV2/src/features/join_message.cpp
+++ b/BigBaseV2/src/features/join_message.cpp
@@ -1,4 +1,5 @@
 #include "features.hpp"
+#include "pointers.hpp"
 
 namespace big
 {
@@ -9,10 +10,11 @@ namespace big
 		if (bJoinMessage)
 		{
 			for (int i = 0; i < 32; i++) {
-				if (!g_players[i].is_online && ENTITY::DOES_ENTITY_EXIST(PLAYER::GET_PLAYER_PED_SCRIPT_INDEX(i))) {
+				if (!NETWORK::NETWORK_IS_PLAYER_CONNECTED(i) && ENTITY::DOES_ENTITY_EXIST(PLAYER::GET_PLAYER_PED_SCRIPT_INDEX(i))) {
 					char joinMsg[64];
-					strcpy(joinMsg, g_players[i].name);
-					strcat(joinMsg, "is joining");
+					strcpy(joinMsg, "<C>");
+					strcat(joinMsg, g_pointers->m_get_player_name(i));
+					strcat(joinMsg, "</C> is joining.");
 
 					features::notify::above_map(joinMsg);
 				}