diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp
index a2c1d52a58..f8c094b7d3 100644
--- a/stepmania/src/NetworkSyncManager.cpp
+++ b/stepmania/src/NetworkSyncManager.cpp
@@ -873,7 +873,7 @@ static bool ConnectToServer( const CString &t )
 	return true;
 }
 
-static Preference<CString> g_sLastServer( "LastConnectedServer",	"" );
+extern Preference<CString> g_sLastServer;
 
 LuaFunction( ConnectToServer, 				ConnectToServer( ( CString(SArg(1)).length()==0 ) ? CString(g_sLastServer) : CString(SArg(1) ) ) )
 
diff --git a/stepmania/src/ScreenNetworkOptions.cpp b/stepmania/src/ScreenNetworkOptions.cpp
index c16503e613..368339ad1f 100644
--- a/stepmania/src/ScreenNetworkOptions.cpp
+++ b/stepmania/src/ScreenNetworkOptions.cpp
@@ -39,7 +39,7 @@ OptionRowDefinition g_NetworkOptionsLines[NUM_NETWORK_OPTIONS_LINES] = {
 AutoScreenMessage( SM_DoneConnecting )
 AutoScreenMessage( SM_ServerNameEnter )
 
-static Preference<CString> g_sLastServer( "LastConnectedServer",	"" );
+Preference<CString> g_sLastServer( "LastConnectedServer",	"" );
 
 REGISTER_SCREEN_CLASS( ScreenNetworkOptions );
 ScreenNetworkOptions::ScreenNetworkOptions( CString sClassName ) : ScreenOptions( sClassName )
@@ -137,7 +137,7 @@ void ScreenNetworkOptions::MenuStart( const InputEventPlus &input )
 		case NO_START_SERVER:
 			if (!NSMAN->isLanServer)
 			{
-				ScreenTextEntry::TextEntry( SM_ServerNameEnter, "Enter a server name...", "", 0);
+				ScreenTextEntry::TextEntry( SM_ServerNameEnter, "Enter a server name...", "", 128);
 			}
 			break;
 		case NO_STOP_SERVER: