diff --git a/src/serverlist.cpp b/src/serverlist.cpp
index 9bcb2d8a3..2212cfa2b 100644
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@@ -74,12 +74,11 @@ void sendAnnounce(AnnounceAction action,
 		bool proto_compat = g_settings->getBool("enable_protocol_compat");
 		server["name"]         = g_settings->get("server_name");
 		server["description"]  = g_settings->get("server_description");
+		server["server_id"]    = "multicraft";
 		if (g_settings->getBool("announce_mt_id")) {
-			server["version"]      = "0.4.16";//g_version_string;
-			server["server_id"]    = "minetest";
+			server["version"]      = "0.4.16";
 		} else {
 			server["version"]      = g_version_string;
-			server["server_id"]    = "multicraft";
 		}
 		server["proto_min"]    = strict_checking ? LATEST_PROTOCOL_VERSION : (proto_compat ? SERVER_PROTOCOL_VERSION_MIN : SERVER_PROTOCOL_VERSION_MIN_NOCOMPAT);
 		server["proto_max"]    = strict_checking ? LATEST_PROTOCOL_VERSION : SERVER_PROTOCOL_VERSION_MAX;
@@ -118,26 +117,13 @@ void sendAnnounce(AnnounceAction action,
 			server["lag"] = lag;
 	}
 
-	const std::string json1;
-	const std::string json2;
+	const std::string json = fastWriteJson(server);
 	if (g_settings->getBool("announce_mt_url")) {
-		if (g_settings->getBool("announce_mt_id")) {
-			server["version"]      = "0.4.16";//g_version_string;
-			server["server_id"]    = "minetest";
-		}
-		json1 = fastWriteJson(server);
-		sendAnnounceInner(action, json1, base64_decode("c2VydmVycy5taW5ldGVzdC5uZXQ"));
-		server["version"]      = g_version_string;
-		server["server_id"]    = "multicraft";
-		json2 = fastWriteJson(server);
-		sendAnnounceInner(action, json2, base64_decode("c2VydmVycy5tdWx0aWNyYWZ0Lndvcmxk"));
+		sendAnnounceInner(action, json, base64_decode("c2VydmVycy5taW5ldGVzdC5uZXQ"));
+		sendAnnounceInner(action, json, base64_decode("c2VydmVycy5tdWx0aWNyYWZ0Lndvcmxk"));
 	} else {
-		json1 = fastWriteJson(server);
-		sendAnnounceInner(action, json1, g_settings->get("serverlist_url"));
-		server["version"]      = g_version_string;
-		server["server_id"]    = "multicraft";
-		json2 = fastWriteJson(server);
-		sendAnnounceInner(action, json2, base64_decode("c2VydmVycy5tdWx0aWNyYWZ0Lndvcmxk"));
+		sendAnnounceInner(action, json, g_settings->get("serverlist_url"));
+		sendAnnounceInner(action, json, base64_decode("c2VydmVycy5tdWx0aWNyYWZ0Lndvcmxk"));
 	}
 }
 #endif