diff --git a/gamemodes/irresistible/cnr/features/random_messages.pwn b/gamemodes/irresistible/cnr/features/random_messages.pwn
index 2213482..4e499cc 100644
--- a/gamemodes/irresistible/cnr/features/random_messages.pwn
+++ b/gamemodes/irresistible/cnr/features/random_messages.pwn
@@ -67,7 +67,8 @@ static stock
 		{ "{8ADE47}Stephanie:"COL_WHITE" Get casino rewards points by gambling at any casino! Use "COL_GREY"/casino rewards"COL_WHITE" to spend them!" },
 		{ "{8ADE47}Stephanie:"COL_WHITE" Race your friends in a street race or outrun race by using "COL_GREY"/race"COL_WHITE"!" },
 		{ "{8ADE47}Stephanie:"COL_WHITE" Want 3 days of free V.I.P? Add an "COL_GREY"/email"COL_WHITE" to your account!" },
-		{ "{8ADE47}Stephanie:"COL_WHITE" Contribute to our feature "COL_GREY"/crowdfunds"COL_WHITE"! Early supporters get benefits!" }
+		{ "{8ADE47}Stephanie:"COL_WHITE" Contribute to our feature "COL_GREY"/crowdfunds"COL_WHITE"! Early supporters get benefits!" },
+		{ "{8ADE47}Stephanie:"COL_WHITE" Don't want to be interrupted as an innocent player? Enter passive mode with "COL_GREY"/passive"COL_WHITE"!" }
 	},
 	g_randomMessageTick 			= 0
 ;
diff --git a/gamemodes/sf-cnr.pwn b/gamemodes/sf-cnr.pwn
index 85242db..802a7cd 100644
--- a/gamemodes/sf-cnr.pwn
+++ b/gamemodes/sf-cnr.pwn
@@ -5218,6 +5218,7 @@ public OnPlayerUnjailed( playerid, reasonid )
     PlainUnjailPlayer 		( playerid );
 	SetPlayerColorToTeam	( playerid );
     ClearPlayerWantedLevel	( playerid );
+    ResetPlayerPassiveMode 	( playerid );
 	return 1;
 }
 
@@ -17987,11 +17988,17 @@ stock GivePlayerWantedLevel( playerid, wantedlevel, bool:loadingstats = false )
 	if ( p_WantedLevel[ playerid ] )
 	{
 		SetPlayerColor( playerid, COLOR_WANTED2 );
+
 		if ( IsPlayerSpawned( playerid ) )
 		{
 			format( szWanted, sizeof( szWanted ), "] %d ]", p_WantedLevel[ playerid ] );
 			PlayerTextDrawSetString( playerid, p_WantedLevelTD[ playerid ], szWanted );
 			if ( !p_inMovieMode{ playerid } ) PlayerTextDrawShow( playerid, p_WantedLevelTD[ playerid ] );
+
+			// remove passive mode if the player is wanted
+			if ( p_PassiveModeExpireTimer[ playerid ] == -1 ) {
+				p_PassiveModeExpireTimer[ playerid ] = PassiveMode_Reset( playerid, 4 ); // it will just set it to anything but -1 for now
+			}
 		}
 	}
 	else SetPlayerColorToTeam( playerid ), PlayerTextDrawHide( playerid, p_WantedLevelTD[ playerid ] ), Uncuff( playerid );