Index: binaries/data/mods/public/gui/gamesetup/gamesetup.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -981,10 +981,17 @@
 	g_IsNetworked = attribs.type != "offline";
 	g_IsController = attribs.type != "client";
 	g_IsTutorial = !!attribs.tutorial;
-	g_ServerName = attribs.serverName;
 	g_ServerPort = attribs.serverPort;
 	g_StunEndpoint = attribs.stunEndpoint;
 
+	if (g_IsNetworked)
+	{
+		g_ServerName = Engine.GetServerName();
+		let serverName = Engine.GetGUIObjectByName("serverName");
+		serverName.hidden = false;
+		serverName.caption = sprintf(translate("Server name: %(serverName)s"), { "serverName": g_ServerName } );
+	}
+
 	if (!g_IsNetworked)
 		g_PlayerAssignments = {
 			"local": {
Index: binaries/data/mods/public/gui/gamesetup/gamesetup.xml
===================================================================
--- binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -39,6 +39,8 @@
 				onTick();
 			</action>
 
+			<object size="24 20 30% 49" name="serverName" type="text" style="ModernLeftLabelText" hidden="true"/>
+
 			<!-- Player assignments -->
 			<object size="24 49 100%-440 345" type="image" sprite="ModernDarkBoxGold" name="playerAssignmentsPanel">
 				<object size="0 6 100% 30">
Index: binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js
===================================================================
--- binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js
+++ binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js
@@ -28,6 +28,11 @@
  */
 var g_StunEndpoint;
 
+function constructServerName(playerName)
+{
+	return sprintf(translate("%(name)s's game"), { "name": playerName });
+}
+
 function init(attribs)
 {
 	g_UserRating = attribs.rating;
@@ -51,8 +56,7 @@
 		if (Engine.HasXmppClient())
 		{
 			Engine.GetGUIObjectByName("hostPlayerName").caption = attribs.name;
-			Engine.GetGUIObjectByName("hostServerName").caption =
-				sprintf(translate("%(name)s's game"), { "name": attribs.name });
+			Engine.GetGUIObjectByName("hostServerName").caption = constructServerName(attribs.name);
 
 			Engine.GetGUIObjectByName("useSTUN").checked = Engine.ConfigDB_GetValue("user", "lobby.stun.enabled") == "true";
 		}
@@ -106,7 +110,7 @@
 	else if (!Engine.GetGUIObjectByName("pageHost").hidden)
 	{
 		let hostPlayerName = Engine.GetGUIObjectByName("hostPlayerName").caption;
-		let hostServerName = Engine.GetGUIObjectByName("hostServerName").caption;
+		let hostServerName = Engine.HasXmppClient() ? Engine.GetGUIObjectByName("hostServerName").caption : constructServerName(hostPlayerName);
 		let hostPort = Engine.GetGUIObjectByName("hostPort").caption;
 
 		if (!hostServerName)
@@ -322,10 +326,9 @@
 
 	try
 	{
-		if (g_UserRating)
-			Engine.StartNetworkHost(playername + " (" + g_UserRating + ")", port);
-		else
-			Engine.StartNetworkHost(playername, port);
+		Engine.StartNetworkHost( playername + (g_UserRating ? " (" + g_UserRating + ")" : ""),
+			port,
+			servername);
 	}
 	catch (e)
 	{
Index: source/gui/scripting/ScriptFunctions.cpp
===================================================================
--- source/gui/scripting/ScriptFunctions.cpp
+++ source/gui/scripting/ScriptFunctions.cpp
@@ -342,13 +342,13 @@
 	g_NetClient->SendGameSetupMessage(&attribs, *(pCxPrivate->pScriptInterface));
 }
 
-void StartNetworkHost(ScriptInterface::CxPrivate* pCxPrivate, const CStrW& playerName, const u16 serverPort)
+void StartNetworkHost(ScriptInterface::CxPrivate* pCxPrivate, const CStrW& playerName, const u16 serverPort, const CStrW& serverName)
 {
 	ENSURE(!g_NetClient);
 	ENSURE(!g_NetServer);
 	ENSURE(!g_Game);
 
-	g_NetServer = new CNetServer();
+	g_NetServer = new CNetServer(serverName);
 	if (!g_NetServer->SetupConnection(serverPort))
 	{
 		pCxPrivate->pScriptInterface->ReportError("Failed to start server");
@@ -443,6 +443,12 @@
 	return g_NetClient->GetGUID();
 }
 
+CStrW GetServerName(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
+{
+	ENSURE(g_NetClient);
+	return g_NetClient->GetServerName();
+}
+
 void KickPlayer(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const CStrW& playerName, bool ban)
 {
 	ENSURE(g_NetClient);
@@ -1071,11 +1077,12 @@
 	scriptInterface.RegisterFunction<void, &StartNetworkGame>("StartNetworkGame");
 	scriptInterface.RegisterFunction<void, JS::HandleValue, int, &StartGame>("StartGame");
 	scriptInterface.RegisterFunction<void, &Script_EndGame>("EndGame");
-	scriptInterface.RegisterFunction<void, CStrW, u16, &StartNetworkHost>("StartNetworkHost");
+	scriptInterface.RegisterFunction<void, CStrW, u16, CStrW, &StartNetworkHost>("StartNetworkHost");
 	scriptInterface.RegisterFunction<void, CStrW, CStr, u16, bool, std::string, &StartNetworkJoin>("StartNetworkJoin");
 	scriptInterface.RegisterFunction<u16, &GetDefaultPort>("GetDefaultPort");
 	scriptInterface.RegisterFunction<void, &DisconnectNetworkGame>("DisconnectNetworkGame");
 	scriptInterface.RegisterFunction<std::string, &GetPlayerGUID>("GetPlayerGUID");
+	scriptInterface.RegisterFunction<CStrW, &GetServerName>("GetServerName");
 	scriptInterface.RegisterFunction<void, CStrW, bool, &KickPlayer>("KickPlayer");
 	scriptInterface.RegisterFunction<JS::Value, &PollNetworkClient>("PollNetworkClient");
 	scriptInterface.RegisterFunction<void, JS::HandleValue, &SetNetworkGameAttributes>("SetNetworkGameAttributes");
Index: source/network/NetClient.h
===================================================================
--- source/network/NetClient.h
+++ source/network/NetClient.h
@@ -97,6 +97,11 @@
 	CStr GetGUID() const { return m_GUID; }
 
 	/**
+	 * Returns the server name.
+	 */
+	CStrW GetServerName() const { return m_ServerName; }
+
+	/**
 	 * Set up a connection to the remote networked server.
 	 * @param server IP address or host name to connect to
 	 * @return true on success, false on connection failure
@@ -251,6 +256,7 @@
 
 	CGame *m_Game;
 	CStrW m_UserName;
+	CStrW m_ServerName;
 
 	/// Current network session (or NULL if not connected)
 	CNetClientSession* m_Session;
Index: source/network/NetClient.cpp
===================================================================
--- source/network/NetClient.cpp
+++ source/network/NetClient.cpp
@@ -514,6 +514,9 @@
 
 	CNetClient* client = (CNetClient*)context;
 
+	CSrvHandshakeResponseMessage* message = (CSrvHandshakeResponseMessage*)event->GetParamRef();
+	client->m_ServerName = message->m_ServerName;
+
 	CAuthenticateMessage authenticate;
 	authenticate.m_GUID = client->m_GUID;
 	authenticate.m_Name = client->m_UserName;
@@ -535,7 +538,7 @@
 
 	CAuthenticateResultMessage* message = (CAuthenticateResultMessage*)event->GetParamRef();
 
-	LOGMESSAGE("Net: Authentication result: host=%u, %s", message->m_HostID, utf8_from_wstring(message->m_Message));
+	LOGMESSAGE("Net: Authentication result: host=%u", message->m_HostID);
 
 	client->m_HostID = message->m_HostID;
 	client->m_Rejoin = message->m_Code == ARC_OK_REJOINING;
Index: source/network/NetMessages.h
===================================================================
--- source/network/NetMessages.h
+++ source/network/NetMessages.h
@@ -113,7 +113,7 @@
 START_NMT_CLASS_(SrvHandshakeResponse, NMT_SERVER_HANDSHAKE_RESPONSE)
 	NMT_FIELD_INT(m_UseProtocolVersion, u32, 4)
 	NMT_FIELD_INT(m_Flags, u32, 4)
-	NMT_FIELD(CStrW, m_Message)
+	NMT_FIELD(CStrW, m_ServerName)
 END_NMT_CLASS()
 
 START_NMT_CLASS_(Authenticate, NMT_AUTHENTICATE)
Index: source/network/NetServer.h
===================================================================
--- source/network/NetServer.h
+++ source/network/NetServer.h
@@ -104,7 +104,7 @@
 	 * @param autostartPlayers if positive then StartGame will be called automatically
 	 * once this many players are connected (intended for the command-line testing mode).
 	 */
-	CNetServer(int autostartPlayers = -1);
+	CNetServer(const CStrW& serverName = L"", int autostartPlayers = -1);
 
 	~CNetServer();
 
@@ -178,7 +178,7 @@
 	friend class CNetServer;
 	friend class CNetFileReceiveTask_ServerRejoin;
 
-	CNetServerWorker(int autostartPlayers);
+	CNetServerWorker(const CStrW& serverName, int autostartPlayers);
 	~CNetServerWorker();
 
 	/**
Index: source/network/NetServer.cpp
===================================================================
--- source/network/NetServer.cpp
+++ source/network/NetServer.cpp
@@ -127,8 +127,9 @@
  * See http://trac.wildfiregames.com/ticket/654
  */
 
-CNetServerWorker::CNetServerWorker(int autostartPlayers) :
+CNetServerWorker::CNetServerWorker(const CStrW& serverName, int autostartPlayers) :
 	m_AutostartPlayers(autostartPlayers),
+	m_ServerName(serverName),
 	m_Shutdown(false),
 	m_ScriptInterface(NULL),
 	m_NextHostID(1), m_Host(NULL), m_HostGUID(), m_Stats(NULL),
@@ -137,9 +138,6 @@
 	m_State = SERVER_STATE_UNCONNECTED;
 
 	m_ServerTurnManager = NULL;
-
-	m_ServerName = DEFAULT_SERVER_NAME;
-	m_WelcomeMessage = DEFAULT_WELCOME_MESSAGE;
 }
 
 CNetServerWorker::~CNetServerWorker()
@@ -873,7 +871,7 @@
 
 	CSrvHandshakeResponseMessage handshakeResponse;
 	handshakeResponse.m_UseProtocolVersion = PS_PROTOCOL_VERSION;
-	handshakeResponse.m_Message = server.m_WelcomeMessage;
+	handshakeResponse.m_ServerName = server.m_ServerName;
 	handshakeResponse.m_Flags = 0;
 	session->SendMessage(&handshakeResponse);
 
@@ -1025,7 +1023,6 @@
 	CAuthenticateResultMessage authenticateResult;
 	authenticateResult.m_Code = isRejoining ? ARC_OK_REJOINING : ARC_OK;
 	authenticateResult.m_HostID = newHostID;
-	authenticateResult.m_Message = L"Logged in";
 	session->SendMessage(&authenticateResult);
 
 	server.OnUserJoin(session);
@@ -1476,8 +1473,8 @@
 
 
 
-CNetServer::CNetServer(int autostartPlayers) :
-	m_Worker(new CNetServerWorker(autostartPlayers))
+CNetServer::CNetServer(const CStrW& serverName, int autostartPlayers) :
+	m_Worker(new CNetServerWorker(serverName, autostartPlayers))
 {
 }
 
Index: source/ps/GameSetup/GameSetup.cpp
===================================================================
--- source/ps/GameSetup/GameSetup.cpp
+++ source/ps/GameSetup/GameSetup.cpp
@@ -1548,7 +1548,7 @@
 		if (args.Has("autostart-host-players"))
 			maxPlayers = args.Get("autostart-host-players").ToUInt();
 
-		g_NetServer = new CNetServer(maxPlayers);
+		g_NetServer = new CNetServer(L"autostart", maxPlayers);
 
 		g_NetServer->UpdateGameAttributes(&attrs, scriptInterface);