diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 627c09947..3074d44ed 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -34,84 +34,82 @@
       </head>
 
       <body var:class="bodyClasses"
-      ><var:if condition="isCompatibleBrowser"
-       ><script type="text/javascript">
-	  var ApplicationBaseURL = '<var:string value="applicationPath" />';
-	  var ResourcesURL = '/SOGo.woa/WebServerResources';
+	><var:if condition="isCompatibleBrowser"
+	  ><script type="text/javascript">
+	    var ApplicationBaseURL = '<var:string value="applicationPath" />';
+	    var ResourcesURL = '/SOGo.woa/WebServerResources';
+	    <var:if condition="shortUserNameForDisplay" const:value="anonymous"
+	      const:negate="YES"
+	      >var UserFolderURL = '<var:string value="userFolderPath" />';
+	      var UserLogin = '<var:string value="shortUserNameForDisplay" />';</var:if>
+	  </script>
+	  <script type="text/javascript" rsrc:src="events.js"><!-- space required --></script>
+	  <script type="text/javascript" rsrc:src="prototype.js"><!-- space required --></script>
+	  <script type="text/javascript" rsrc:src="tablekit.js"><!-- space required --></script>
+	  <script type="text/javascript" rsrc:src="tablekit-trueresize.js"><!-- space required --></script>
+	  <script type="text/javascript" rsrc:src="JavascriptAPIExtensions.js"><!-- space required --></script>
+	  <script type="text/javascript" rsrc:src="HTMLElement.js"><!-- space required --></script>
+	  <script type="text/javascript" rsrc:src="HTMLInputElement.js"><!-- space required --></script>
+	  <script type="text/javascript" rsrc:src="HTMLTableElement.js"><!-- space required --></script>
+	  <script type="text/javascript" rsrc:src="HTMLUListElement.js"><!-- space required --></script>
+	  <script type="text/javascript" rsrc:src="generic.js"><!-- space required --></script>
+	  <script type="text/javascript" rsrc:src="SOGoDragAndDrop.js"><!-- space required --></script>
+	  <script type="text/javascript" rsrc:src="SOGoDragHandles.js"><!-- space required --></script>
+	  <var:if condition="hasProductSpecificJavaScript"><script type="text/javascript"
+	      var:src="productJavaScriptURL"><!-- space required --></script></var:if>
+	  <var:if condition="hasPageSpecificJavaScript"><script type="text/javascript"
+	      var:src="pageJavaScriptURL"><!-- space required --></script></var:if>
+	  <var:js-stringtable
+	    var:framework="productFrameworkName"
+	    const:identifier="labels" />
+	  <var:js-stringtable
+	    const:identifier="clabels" />
 	  <var:if condition="shortUserNameForDisplay" const:value="anonymous"
 	    const:negate="YES"
-	    >var UserFolderURL = '<var:string value="userFolderPath" />';
-	  var UserLogin = '<var:string value="shortUserNameForDisplay" />';</var:if>
-	</script>
-	<script type="text/javascript" rsrc:src="events.js"><!-- space required --></script>
-	<script type="text/javascript" rsrc:src="prototype.js"><!-- space required --></script>
-	<script type="text/javascript" rsrc:src="tablekit.js"><!-- space required --></script>
-	<script type="text/javascript" rsrc:src="tablekit-trueresize.js"><!-- space required --></script>
-	<script type="text/javascript" rsrc:src="JavascriptAPIExtensions.js"><!-- space required --></script>
-	<script type="text/javascript" rsrc:src="HTMLElement.js"><!-- space required --></script>
-	<script type="text/javascript" rsrc:src="HTMLInputElement.js"><!-- space required --></script>
-	<script type="text/javascript" rsrc:src="HTMLTableElement.js"><!-- space required --></script>
-	<script type="text/javascript" rsrc:src="HTMLUListElement.js"><!-- space required --></script>
-	<script type="text/javascript" rsrc:src="generic.js"><!-- space required --></script>
-	<script type="text/javascript" rsrc:src="SOGoDragAndDrop.js"><!-- space required --></script>
-	<script type="text/javascript" rsrc:src="SOGoDragHandles.js"><!-- space required --></script>
-	<var:if condition="hasProductSpecificJavaScript"><script type="text/javascript"
-	    var:src="productJavaScriptURL"><!-- space required --></script></var:if>
-	<var:if condition="hasPageSpecificJavaScript"><script type="text/javascript"
-	    var:src="pageJavaScriptURL"><!-- space required --></script></var:if>
-	<var:js-stringtable
-	  var:framework="productFrameworkName"
-	  const:identifier="labels" />
-	<var:js-stringtable
-	  const:identifier="clabels" />
-	<var:if condition="shortUserNameForDisplay" const:value="anonymous"
-	  const:negate="YES"
-	  ><var:if condition="shortUserNameForDisplay" const:value="wrongusernamepassword"
-	  const:negate="YES"
-          ><var:if condition="isPopup" const:negate="YES"
-	    ><var:if condition="context.isUIxDebugEnabled"
-	      ><div id="logConsole"><!-- space --></div></var:if>
-	    <div id="linkBanner" class="linkbanner">
-	      <a id="logoff" var:href="logoffPath"
-		><var:string label:value="Sign Out" /></a>
-	      <a var:href="relativeCalendarPath"
-		><var:string label:value="Calendar" /></a> |
-	      <a var:href="relativeContactsPath"
-		><var:string label:value="Address Book" /></a> |
-	      <a var:href="relativeMailPath"
-		><var:string label:value="Mail" /></a> |
-	      <a var:href="relativePreferencesPath"
-		><var:string label:value="Preferences" /></a>
-	      <var:if condition="context.isUIxDebugEnabled"
-		>| <a href="#"><var:string
-		    label:value="Log Console (dev.)" /></a
-		  ></var:if>
-	    </div>
-	  </var:if
-	    ><var:component className="UIxToolbar" var:toolbar="toolbar"
-	    />
-	</var:if></var:if>
-	
-	<div class="pageContent"
-	  ><var:component-content
-	    /></div>
+	    ><var:if condition="shortUserNameForDisplay" const:value="wrongusernamepassword"
+	      const:negate="YES"
+	      ><var:if condition="isPopup" const:negate="YES"
+		><var:if condition="context.isUIxDebugEnabled"
+		  ><div id="logConsole"><!-- space --></div></var:if>
+		<div id="linkBanner" class="linkbanner">
+		  <a id="logoff" var:href="logoffPath"
+		    ><var:string label:value="Sign Out" /></a>
+		  <a var:href="relativeCalendarPath"
+		    ><var:string label:value="Calendar" /></a> |
+		  <a var:href="relativeContactsPath"
+		    ><var:string label:value="Address Book" /></a> |
+		  <a var:href="relativeMailPath"
+		    ><var:string label:value="Mail" /></a> |
+		  <a var:href="relativePreferencesPath"
+		    ><var:string label:value="Preferences" /></a>
+		  <var:if condition="context.isUIxDebugEnabled"
+		    >| <a href="#"><var:string
+			label:value="Log Console (dev.)" /></a
+		      ></var:if>
+		</div>
+	      </var:if
+		><var:component className="UIxToolbar" var:toolbar="toolbar"
+		/>
+	    </var:if></var:if>
+	  
+	  <div id="pageContent"><var:component-content/></div>
         </var:if>
         <var:if condition="isCompatibleBrowser" const:negate="YES">
-    <div id="loginScreen">
-      <img id="splash" rsrc:src="lori-login.jpg"/><br/><br/>
-      <p><var:string label:value="browserNotCompatible"/></p>
-      <p class="browser"><a href="http://www.getfirefox.com/"><img rsrc:src="browser_firefox.gif"/><var:string label:value="Download"/> Firefox</a></p>
-    <var:if condition="isIE7Compatible">
-      <p><var:string label:value="alternativeBrowsers"/></p>
-      <p class="browser"><a href="http://www.microsoft.com/ie/download/"><img rsrc:src="browser_ie.gif"/><var:string label:value="Download"/> Internet Explorer 7</a></p>
-      <p class="browser"><a href="http://www.apple.com/safari/download/"><img rsrc:src="browser_safari.gif"/><var:string label:value="Download"/> Safari 3</a></p>
-    </var:if>
-    <var:if condition="isMac">
-      <p><var:string label:value="alternativeBrowserSafari"/></p>
-      <p class="browser"><a href="http://www.apple.com/safari/download/"><img rsrc:src="browser_safari.gif"/><var:string label:value="Download"/> Safari 3</a></p>
-    </var:if>
-    </div>
-  </var:if>
+	  <div id="loginScreen">
+	    <img id="splash" rsrc:src="lori-login.jpg"/><br/><br/>
+	    <p><var:string label:value="browserNotCompatible"/></p>
+	    <p class="browser"><a href="http://www.getfirefox.com/"><img rsrc:src="browser_firefox.gif"/><var:string label:value="Download"/> Firefox</a></p>
+	    <var:if condition="isIE7Compatible">
+	      <p><var:string label:value="alternativeBrowsers"/></p>
+	      <p class="browser"><a href="http://www.microsoft.com/ie/download/"><img rsrc:src="browser_ie.gif"/><var:string label:value="Download"/> Internet Explorer 7</a></p>
+	      <p class="browser"><a href="http://www.apple.com/safari/download/"><img rsrc:src="browser_safari.gif"/><var:string label:value="Download"/> Safari 3</a></p>
+	    </var:if>
+	    <var:if condition="isMac">
+	      <p><var:string label:value="alternativeBrowserSafari"/></p>
+	      <p class="browser"><a href="http://www.apple.com/safari/download/"><img rsrc:src="browser_safari.gif"/><var:string label:value="Download"/> Safari 3</a></p>
+	    </var:if>
+	  </div>
+	</var:if>
 	<noscript>
 	  <div class="javascriptPopupBackground">
 	  </div>
