diff --git a/public/templates/admin/logger.tpl b/public/templates/admin/logger.tpl
index 83f569010b..7366760b83 100644
--- a/public/templates/admin/logger.tpl
+++ b/public/templates/admin/logger.tpl
@@ -40,10 +40,7 @@
 <button class="btn btn-lg btn-primary" id="save">Save</button>
 
 <script>
-	var	loadDelay = setInterval(function() {
-		if (nodebb_admin) {
-			nodebb_admin.prepare();
-			clearInterval(loadDelay);
-		}
-	}, 500);
+	require(['forum/admin/settings'], function(Settings) {
+		Settings.prepare();
+	});
 </script>
diff --git a/src/logger.js b/src/logger.js
index 06133ae1ca..ab84f3dad6 100644
--- a/src/logger.js
+++ b/src/logger.js
@@ -139,10 +139,10 @@ var opts = {
 		for(var v in clients) {
 			var client = clients[v];
 
-			if(client.oEmit != client.emit)
+			if(client.oEmit != undefined && client.oEmit != client.emit)
 				client.emit = client.oEmit;
 
-			if(client.$oEmit != client.$emit)
+			if(client.$oEmit != undefined && client.$oEmit != client.$emit)
 				client.$emit = client.$oEmit;
 		}
 	}
diff --git a/src/webserver.js b/src/webserver.js
index e8c01ea261..cea6550cf7 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -156,7 +156,7 @@ var express = require('express'),
 				app.use(function (req, res, next) {
 					res.status(404);
 
-					if (path.dirname(req.url) === '/src/forum') {
+					if (path.dirname(req.url).slice(0, 10) === '/src/forum') {
 						// Handle missing client-side scripts
 						res.type('text/javascript').send(200, '');
 					} else if (req.accepts('html')) {