diff -r 1bbf841e3dfd etmain/src/ui/ui_main.c
--- a/etmain/src/ui/ui_main.c	Sat Apr 02 13:22:55 2011 +0100
+++ b/etmain/src/ui/ui_main.c	Sat Apr 02 19:57:33 2011 +0100
@@ -4366,20 +4366,6 @@
 
 		if ( Q_stricmp( name, "StartServer" ) == 0 ) {
 			float skill;
-			int pb_sv, pb_cl;
-
-			// DHM - Nerve
-			if ( !ui_dedicated.integer ) {
-				pb_sv = (int)trap_Cvar_VariableValue( "sv_punkbuster" );
-				pb_cl = (int)trap_Cvar_VariableValue( "cl_punkbuster" );
-
-				if ( pb_sv && !pb_cl ) {
-					trap_Cvar_Set( "com_errorMessage", "You must either disable PunkBuster on the Server, or enable PunkBuster on the Client before starting a non-dedicated server." );
-					Menus_ActivateByName( "hostGamePopupError", qtrue );
-					return;
-				}
-			}
-			// dhm - Nerve
 
 			trap_Cvar_Set( "ui_connecting", "1" );
 			trap_Cvar_Set( "cg_thirdPerson", "0" );
@@ -7673,14 +7659,7 @@
 			//Menus_ActivateByName( "background_1", qtrue );
 			Menus_ActivateByName( "backgroundmusic", qtrue );    // Arnout: not nice, but best way to do it - putting the music in it's own menudef
 																 // makes sure it doesn't get restarted every time you reach the main menu
-			if ( !cl_profile.string[0] ) {
-				//Menus_ActivateByName( "profilelogin", qtrue );
-				// FIXME: initial profile popup
-				// FIXED: handled in opener now
-				Menus_ActivateByName( "main_opener", qtrue );
-			} else {
-				Menus_ActivateByName( "main_opener", qtrue );
-			}
+			Menus_ActivateByName( "main_opener", qtrue );
 
 			trap_Cvar_VariableStringBuffer( "com_errorMessage", buf, sizeof( buf ) );