diff --git a/main_shared/maps/mp/bots/_bot_script.gsc b/main_shared/maps/mp/bots/_bot_script.gsc
index e291c3d..c934ac4 100644
--- a/main_shared/maps/mp/bots/_bot_script.gsc
+++ b/main_shared/maps/mp/bots/_bot_script.gsc
@@ -248,7 +248,7 @@ classWatch()
 
 	for(;;)
 	{
-		while(!isdefined(self.pers["team"]) || level.oldschool)
+		while(!isdefined(self.pers["team"]) || !allowClassChoice())
 			wait .05;
 			
 		wait 0.5;
@@ -271,7 +271,7 @@ teamWatch()
 
 	for(;;)
 	{
-		while(!isdefined(self.pers["team"]))
+		while(!isdefined(self.pers["team"])  || !allowTeamChoice())
 			wait .05;
 			
 		wait 0.05;
diff --git a/main_shared/maps/mp/bots/_bot_utility.gsc b/main_shared/maps/mp/bots/_bot_utility.gsc
index 9ba79f6..c97e1b6 100644
--- a/main_shared/maps/mp/bots/_bot_utility.gsc
+++ b/main_shared/maps/mp/bots/_bot_utility.gsc
@@ -517,6 +517,22 @@ waittill_either_return(str1, str2)
 	return str2;
 }
 
+/*
+	iw5
+*/
+allowClassChoice()
+{
+	return true;
+}
+
+/*
+	iw5
+*/
+allowTeamChoice()
+{
+	return true;
+}
+
 /*
 	Taken from iw4 script
 */