diff --git a/source/masterserver/scripts/desktop_notifications.js b/source/masterserver/scripts/desktop_notifications.js
index 200610e08..bd0ec7047 100644
--- a/source/masterserver/scripts/desktop_notifications.js
+++ b/source/masterserver/scripts/desktop_notifications.js
@@ -32,7 +32,7 @@ var firstLoop = true;
 
 
 // Modify the document body
-var domUl = document.getElementsByTagName("ul");
+var domUl = document.getElementById("noJsUsage");
 var domBody = document.getElementsByTagName("body");
 
 var wrapperDiv = document.createElement("div");
@@ -41,8 +41,8 @@ wrapperDiv.innerHTML = "The parameters used by the masterserver API will display
 	"<label for=\"refreshTimeId\">Refresh time (in seconds):</label> <input id=\"refreshTimeId\" type=\"number\" width=\"3\" min=\"10\" max=\"999\" /> <label for=\"refreshTimeId\">(minimum 10)</label>";
 wrapperDiv.style.paddingLeft = "30px";
 
-domBody[0].insertBefore(wrapperDiv, domUl[0]);
-domUl[0].parentNode.removeChild(domUl[0]);
+domBody[0].insertBefore(wrapperDiv, domUl);
+domUl.parentNode.removeChild(domUl);
 
 
 // Modifying string object to support startsWith(String) function
@@ -260,13 +260,13 @@ function timedRequest()
 			serverList = newServerList;
 
 			// Write to actual table when done only, otherwise the browser trips as it tries to fix the partial table formatting
-			var tableDOM = document.getElementsByTagName("tbody");
-			tableDOM[0].innerHTML = table;
+			var tableDOM = document.getElementById("gamesTable");
+			tableDOM.innerHTML = table;
 
-						//debugger;
-						for(var gameIndex = 100; gameIndex < 200; ++gameIndex) {
-								setupGameStatsLink(gameIndex);
-						}
+			//debugger;
+			for(var gameIndex = 100; gameIndex < 200; ++gameIndex) {
+					setupGameStatsLink(gameIndex);
+			}
 
 			// Catch empty case
 			if(jsonText.length === 0)
diff --git a/source/masterserver/showServers.php b/source/masterserver/showServers.php
index b971c249a..d924b3d2f 100644
--- a/source/masterserver/showServers.php
+++ b/source/masterserver/showServers.php
@@ -62,7 +62,7 @@
 	echo '	</head>' . PHP_EOL;
 	echo '	<body>' . PHP_EOL;
 	echo '		<h1><a href="' . htmlspecialchars( PRODUCT_URL ) . '">' . htmlspecialchars( PRODUCT_NAME ) . '</a> gameservers</h1>' . PHP_EOL;
-	echo '		<table>' . PHP_EOL;
+	echo '		<table id="gamesTable">' . PHP_EOL;
 	echo '			<tr>' . PHP_EOL;
 	echo '				<th title="glestVersion">Version</th>' . PHP_EOL;
 	echo '				<th title="status">Status</th>' . PHP_EOL;
@@ -216,7 +216,7 @@
 	}
 
 	echo '		<p>Usage:</p>' . PHP_EOL;
-	echo '		<ul>' . PHP_EOL;
+	echo '		<ul id="noJsUsage">' . PHP_EOL;
 	echo '			<li>You can have this page auto <a href="?refresh=60" rel="nofollow">refresh every 60 seconds</a> by appending <code>?refresh=60</code> to the URL. Minimum refresh time is 10 seconds.</li>' . PHP_EOL;
 	echo '			<li>The parameters used by the masterserver API will display when you move your mouse pointer over any of the table headings.</li>' . PHP_EOL;
 	echo '		</ul>' . PHP_EOL;
