diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 7943f2f2a..5a36bda9e 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -573,8 +573,14 @@ function log(message) {
       logWindow = logWindow.opener;
   }
   var logConsole = logWindow.document.getElementById("logConsole");
-  if (logConsole)
-    logConsole.innerHTML += message.replace("<", "&lt;", "g") + '<br />' + "\n";
+  if (logConsole) {
+     var logMessage = message.replace("<", "&lt;", "g");
+     logMessage = logMessage.replace("\r\n", "<br />\n", "g");
+     logMessage = logMessage.replace("\n", "<br />\n", "g");
+     logMessage = logMessage.replace(" ", "&nbsp;", "g");
+     logMessage += '<br />' + "\n";
+     logConsole.innerHTML += logMessage;
+  }
 }
 
 function backtrace() {