diff --git a/main_shared/maps/mp/bots/_bot_loadout.gsc b/main_shared/maps/mp/bots/_bot_loadout.gsc
index 74e37db..32e6242 100644
--- a/main_shared/maps/mp/bots/_bot_loadout.gsc
+++ b/main_shared/maps/mp/bots/_bot_loadout.gsc
@@ -249,6 +249,8 @@ bot_rank()
 	self.pers["plevel"] = prestige;
 	self setRank( rankId, prestige );
 
+	self maps\mp\gametypes\_rank::syncxpstat();
+
 	if ( !level.gameEnded )
 		level waittill( "game_ended" );
 
diff --git a/main_shared/maps/mp/bots/_bot_script.gsc b/main_shared/maps/mp/bots/_bot_script.gsc
index 9de84a9..e1bb1f3 100644
--- a/main_shared/maps/mp/bots/_bot_script.gsc
+++ b/main_shared/maps/mp/bots/_bot_script.gsc
@@ -85,6 +85,14 @@ bot_skip_killcam()
 	}
 }
 
+/*
+	bot class t5
+*/
+chooseRandomClass()
+{
+	return "smg_mp";
+}
+
 /*
 	Selects a class for the bot.
 */
@@ -99,9 +107,12 @@ classWatch()
 
 		wait 0.5;
 
-		self notify( "menuresponse", game["menu_changeclass"], "smg_mp" );
+		if ( !maps\mp\gametypes\_globallogic_utils::isValidClass( self.class ) || !isDefined( self.bot_change_class ) )
+			self notify( "menuresponse", game["menu_changeclass"], self chooseRandomClass() );
 
-		while ( isdefined( self.pers["team"] ) && isdefined( self.pers["class"] ) )
+		self.bot_change_class = true;
+
+		while ( isdefined( self.pers["team"] ) && maps\mp\gametypes\_globallogic_utils::isValidClass( self.class ) && isDefined( self.bot_change_class ) )
 			wait .05;
 	}
 }
@@ -118,8 +129,10 @@ teamWatch()
 		while ( !isdefined( self.pers["team"] ) || !allowTeamChoice() )
 			wait .05;
 
-		wait 0.05;
-		self notify( "menuresponse", game["menu_team"], getDvar( "bots_team" ) );
+		wait 0.1;
+
+		if ( self.team != "axis" && self.team != "allies" )
+			self notify( "menuresponse", game["menu_team"], getDvar( "bots_team" ) );
 
 		while ( isdefined( self.pers["team"] ) )
 			wait .05;