diff --git a/Source/Menu/MenuMain.c b/Source/Menu/MenuMain.c
index 6fbc4343..22ab3b41 100644
--- a/Source/Menu/MenuMain.c
+++ b/Source/Menu/MenuMain.c
@@ -47,7 +47,6 @@ void Menu_Main( void ) {
 	Object_Button( '72 384', BTN_README, __NULL__, fButtonAlpha[4] );
 	Object_Button( '72 412', BTN_VISITWEB, __NULL__, fButtonAlpha[5] );
 	Object_Button( '72 440', BTN_QUIT, Main_ButtonQuit, fButtonAlpha[6] );
-	
 }
 
 /*
diff --git a/Source/Menu/MenuMultiplayer.c b/Source/Menu/MenuMultiplayer.c
index 567521ef..9bb6dc20 100644
--- a/Source/Menu/MenuMultiplayer.c
+++ b/Source/Menu/MenuMultiplayer.c
@@ -107,6 +107,12 @@ void Menu_Multiplayer( void ) {
 	static int iScrollServer;
 	static int iServersTotal;
 	
+	static void Multiplayer_ButtonJoin( void ) {
+		if ( iSelectedServer >= 0 ) {
+			localcmd( sprintf( "connect %s\n", gethostcachestring( fldAddress, iSelectedServer ) ) );
+			m_hide();
+		}
+	}
 	static void Multiplayer_ButtonCreate( void ) {
 		iMenu = MENU_MULTIPLAYER_CREATE;
 	}
@@ -120,7 +126,6 @@ void Menu_Multiplayer( void ) {
 	
 	// Initialize it on the first run
 	if ( iSelectedServer == -1 ) {
-		localcmd( "com_protocolname FreeCS\n" );
 		//clear the filter
 		resethostcachemasks();
 		//sethostcachemaskstring( 0, gethostcacheindexforkey( "gamedir" ), "freecs", SLIST_TEST_EQUAL );
@@ -142,7 +147,7 @@ void Menu_Multiplayer( void ) {
 	iServersTotal = gethostcachevalue( SLIST_HOSTCACHEVIEWCOUNT );
 	
 	Menu_SetClipArea( '32 148', '164 160' );
-	Object_Button( '32 148', BTN_JOINGAME, __NULL__, fButtonAlpha[0] );
+	Object_Button( '32 148', BTN_JOINGAME, Multiplayer_ButtonJoin, fButtonAlpha[0] );
 	Object_Button( '32 180', BTN_CREATE, Multiplayer_ButtonCreate, fButtonAlpha[1] );
 	Object_Button( '32 212', BTN_GAMEINFO, __NULL__, fButtonAlpha[2] );
 	Object_Button( '32 244', BTN_REFRESHLIST, Multiplayer_ButtonRefresh, fButtonAlpha[3] );
diff --git a/freecs/csprogs.dat b/freecs/csprogs.dat
index 4b387fb7..d01f089c 100644
Binary files a/freecs/csprogs.dat and b/freecs/csprogs.dat differ
diff --git a/freecs/default.cfg b/freecs/default.cfg
index b2657b10..3207a42e 100644
--- a/freecs/default.cfg
+++ b/freecs/default.cfg
@@ -34,6 +34,7 @@ bind m chooseteam
 bind ESC togglemenu
 
 // Movement Variables
+seta com_protocolname "FREECS"
 seta sv_maxspeed 240
 seta cl_forwardspeed 240
 seta cl_sidespeed 240
diff --git a/freecs/ftesrv.cfg b/freecs/ftesrv.cfg
new file mode 100755
index 00000000..5090efa4
--- /dev/null
+++ b/freecs/ftesrv.cfg
@@ -0,0 +1,13 @@
+hostname "FreeCS Server"
+
+seta com_protocolname "FREECS"
+seta sv_maxspeed 240
+seta mp_startmoney "800"
+seta mp_buytime 90
+seta mp_freezetime 6
+seta mp_c4timer 45
+seta mp_roundtime 5
+seta mp_fillweapons 0
+seta pm_bunnyspeedcap 1
+seta com_nogamedirnativecode "0"
+seta maxplayers 8
\ No newline at end of file
diff --git a/freecs/menu.dat b/freecs/menu.dat
index ae59d8fe..fe72580a 100755
Binary files a/freecs/menu.dat and b/freecs/menu.dat differ
diff --git a/freecs/progs.dat b/freecs/progs.dat
index 42fdf891..94051f74 100644
Binary files a/freecs/progs.dat and b/freecs/progs.dat differ