diff --git a/gamemodes/irresistible/cnr/features/player/player_settings.pwn b/gamemodes/irresistible/cnr/features/player/player_settings.pwn
index 2ef7491..32e6c41 100644
--- a/gamemodes/irresistible/cnr/features/player/player_settings.pwn
+++ b/gamemodes/irresistible/cnr/features/player/player_settings.pwn
@@ -31,7 +31,7 @@ static stock
 	g_PlayerSettings 				[ MAX_SETTINGS ] [ 24 ] = {
 		{ "Prevent Bail Offers" }, { "Prevent Event Teleports" }, { "Prevent Gang Invites" }, { "Prevent Chat Prefixes" }, { "Prevent Ransom Offers" },
 		{ "Prevent Auto-Save" }, { "Display Connection Log" }, { "Display Hitmarker" }, { "Set V.I.P Skin" }, { "Hide Total Coin Bar" }, { "Hide Last Donor Text" },
-		{ "Manual Pickup Weapon" }, { "Prevent Passive Mode" }, { "Display Chat ID's" }
+		{ "Manual Pickup Weapon" }, { "Prevent Passive Mode" }, { "Display User ID In Chat" }
 	},
 	bool: p_PlayerSettings 			[ MAX_PLAYERS ] [ MAX_SETTINGS char ]
 ;
@@ -197,4 +197,4 @@ stock IsPlayerSettingToggled( playerid, settingid ) {
 
 stock IsPlayerVIPSkinToggled( playerid ) {
 	return p_PlayerSettings[ playerid ] { SETTING_VIPSKIN };
-}
\ No newline at end of file
+}
diff --git a/gamemodes/sf-cnr.pwn b/gamemodes/sf-cnr.pwn
index 79b6c9d..6e35b46 100644
--- a/gamemodes/sf-cnr.pwn
+++ b/gamemodes/sf-cnr.pwn
@@ -2033,14 +2033,18 @@ public OnPlayerText( playerid, text[ ] )
 			}
 		}
 	}
+
 	DCC_SendChannelMessageFormatted( discordGeneralChan, "**%s(%d):** %s", ReturnPlayerName( playerid ), playerid, text ); // p_Class[ playerid ] == CLASS_POLICE ? 12 : 4
 
-	foreach ( new iPlayer : Player )
-	{
-		if ( IsPlayerSettingToggled( iPlayer, SETTING_CHAT_ID ) )
-			return SendClientMessageFormatted( iPlayer, GetPlayerColor( playerid ), "%s(%d): "COL_WHITE"%s", ReturnPlayerName( playerid ), playerid, text ), 0;
+	// custom player id setting
+	foreach ( new iPlayer : Player ) {
+		if ( IsPlayerSettingToggled( iPlayer, SETTING_CHAT_ID ) ) {
+			SendClientMessageFormatted( iPlayer, GetPlayerColor( playerid ), "%s(%d): "COL_WHITE"%s", ReturnPlayerName( playerid ), playerid, text );
+		} else {
+			SendPlayerMessageToPlayer( iPlayer, playerid, text );
+		}
 	}
-	return 1;
+	return 0;
 }
 
 function RapeDamage( playerid )