diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index d5361d580..16ac02335 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -56,11 +56,8 @@
             const:identifier="labels" />
 
           <var:if condition="isPopup" const:negate="YES"
-            ><div id="logConsole"><!-- space --></div>
-            <script type="text/javascript">
-              initQueryParameters();
-              initLogConsole();
-            </script>
+            ><var:if condition="context.isUIxDebugEnabled"
+              ><div id="logConsole"><!-- space --></div></var:if>
 
             <div class="linkbanner">
               <a var:href="relativeHomePath"
@@ -74,9 +71,11 @@
               <a href="http://to.be.done/"
                 ><var:string label:value="Right Administration" /></a> |
               <a var:href="logoffPath"
-                ><var:string label:value="Logoff" /></a> |
-              <a href="#" onclick="toggleLogConsole();"
-                ><var:string label:value="Log Console (dev.)" /></a>
+                ><var:string label:value="Logoff" /></a>
+              <var:if condition="context.isUIxDebugEnabled"
+                >| <a href="#" onclick="toggleLogConsole();"
+                  ><var:string label:value="Log Console (dev.)" /></a
+                  ></var:if>
             </div>
           </var:if
             
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 18494b9ae..13c58d074 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -511,10 +511,6 @@ function onMenuEntryClick(event, menuId)
   return false;
 }
 
-function initQueryParameters() {
-  queryParameters = parseQueryParameters('' + window.location);
-}
-
 function parseQueryParameters(url) {
   var parameters = new Array();
 
@@ -532,12 +528,14 @@ function parseQueryParameters(url) {
 
 function initLogConsole() {
   var logConsole = document.getElementById('logConsole');
-  logConsole.innerHTML = '<a style="-moz-opacity: 1.0; text-decoration: none; float: right; padding: .5em; background: #aaa; color: #333;" id="logConsoleClose" href="#" onclick="return toggleLogConsole();">X</a>';
+  if (logConsole) {
+    logConsole.innerHTML = '<a style="-moz-opacity: 1.0; text-decoration: none; float: right; padding: .5em; background: #aaa; color: #333;" id="logConsoleClose" href="#" onclick="return toggleLogConsole();">X</a>';
+    
+    var node = document.getElementsByTagName('body')[0];
 
-  var node = document.getElementsByTagName('body')[0];
-
-  node.addEventListener("keydown", onBodyKeyDown, false);
-  logConsole.addEventListener("dblclick", onLogDblClick, false);
+    node.addEventListener("keydown", onBodyKeyDown, false);
+    logConsole.addEventListener("dblclick", onLogDblClick, false);
+  }
 }
 
 function onBodyKeyDown(event)
@@ -938,6 +936,8 @@ function indexColor(number) {
 
 var onLoadHandler = {
   handleEvent: function (event) {
+    queryParameters = parseQueryParameters('' + window.location);
+    initLogConsole();
     initTabs();
     configureDragHandles();
     configureSortableTableHeaders();