diff -r 31fcaa5375a1 -r e72987579514 src/network/network_udp.cpp
--- a/src/network/network_udp.cpp	Fri Aug 03 19:16:36 2007 +0000
+++ b/src/network/network_udp.cpp	Fri Aug 03 22:09:42 2007 +0000
@@ -44,7 +44,7 @@
 DEF_UDP_RECEIVE_COMMAND(Master, PACKET_UDP_MASTER_ACK_REGISTER)
 {
 	_network_advertise_retries = 0;
-	DEBUG(net, 2, "[udp] advertising on master server successfull");
+	DEBUG(net, 2, "[udp] advertising on master server successful");
 
 	/* We are advertised, but we don't want to! */
 	if (!_network_advertise) NetworkUDPRemoveAdvertise();
@@ -490,10 +490,12 @@
 
 	// Clear item in gamelist
 	item = NetworkGameListAddItem(inet_addr(inet_ntoa(out_addr.sin_addr)), ntohs(out_addr.sin_port));
-	memset(&item->info, 0, sizeof(item->info));
-	ttd_strlcpy(item->info.server_name, host, lengthof(item->info.server_name));
-	ttd_strlcpy(item->info.hostname, host, lengthof(item->info.hostname));
-	item->online   = false;
+	if (StrEmpty(item->info.server_name)) {
+		memset(&item->info, 0, sizeof(item->info));
+		ttd_strlcpy(item->info.server_name, host, lengthof(item->info.server_name));
+		ttd_strlcpy(item->info.hostname, host, lengthof(item->info.hostname));
+		item->online = false;
+	}
 	item->manually = manually;
 
 	// Init the packet