diff --git a/Source/Menu-FN/m_creategame.cpp b/Source/Menu-FN/m_creategame.cpp
index 5a43882f..385253af 100644
--- a/Source/Menu-FN/m_creategame.cpp
+++ b/Source/Menu-FN/m_creategame.cpp
@@ -33,12 +33,14 @@ void create_btnok_start(void)
 		localcmd(sprintf("map %s\n", startmap));
 		g_menupage = PAGE_LANGAMES;
 	}
-	
-	startmap = create_lbMaps.GetSelectedItem();
-	
+
+	/* Strip .bsp extension before submitting */
+	startmap = substring(create_lbMaps.GetSelectedItem(), 0, -4);
+
 	if (startmap == __NULL__) {
 		return;
 	}
+
 	localsound("../media/launch_dnmenu1.wav");
 	header.SetStartEndPos(45,45,30,172);
 	header.SetStartEndSize(460,80,156,26);
diff --git a/Source/Menu-FN/m_creategame_inet.cpp b/Source/Menu-FN/m_creategame_inet.cpp
index 0b16f251..ebddda97 100644
--- a/Source/Menu-FN/m_creategame_inet.cpp
+++ b/Source/Menu-FN/m_creategame_inet.cpp
@@ -15,15 +15,20 @@ void createinet_btnok_start(void)
 {
 	static string startmap;
 	static void createinet_btnok_end(void) {
+		localcmd(sprintf("hostname %s\n", create_tbHostname.m_text));
+		localcmd(sprintf("sv_playerslots %s\n", create_tbMaxplayers.m_text));
+		localcmd(sprintf("password %s\n", create_tbPassword.m_text));
 		localcmd(sprintf("map %s\n", startmap));
 		g_menupage = PAGE_INTERNETGAMES;
 	}
-	
-	startmap = create_lbMaps.GetSelectedItem();
-	
+
+	/* Strip .bsp extension before submitting */
+	startmap = substring(create_lbMaps.GetSelectedItem(), 0, -5);
+
 	if (startmap == __NULL__) {
 		return;
 	}
+
 	localsound("../media/launch_dnmenu1.wav");
 	header.SetStartEndPos(45,45,30,172);
 	header.SetStartEndSize(460,80,156,26);
diff --git a/fn/menu.dat b/fn/menu.dat
index 7d0996de..9056a262 100644
Binary files a/fn/menu.dat and b/fn/menu.dat differ