diff --git a/ui_mp/scriptmenus/class.menu b/ui_mp/scriptmenus/class.menu
index 3fb8f0c..de75584 100644
--- a/ui_mp/scriptmenus/class.menu
+++ b/ui_mp/scriptmenus/class.menu
@@ -386,7 +386,7 @@
 			textalignx -60
 			textscale 0.375
 			text "@MPUI_CHOOSE_CLASS"
-			disabled when ( !( ( localvarstring( "ui_team" ) == "marines" ) || ( localvarstring( "ui_team" ) == "opfor" ) ) || !( 1 ) )
+			disabled when ( !( ( localvarstring( "ui_team" ) == "marines" ) || ( localvarstring( "ui_team" ) == "opfor" ) ) || !( dvarbool( "ui_allow_classchange" )  ) )
 			action
 			{
 				play "mouse_click";