diff --git a/webtools/addons/public/htdocs/css/cavendish/template.css b/webtools/addons/public/htdocs/css/cavendish/template.css
index 95cccdaeb03..a64e23ee269 100755
--- a/webtools/addons/public/htdocs/css/cavendish/template.css
+++ b/webtools/addons/public/htdocs/css/cavendish/template.css
@@ -67,6 +67,14 @@ body {
 	font-size: 85%;
 }
 
+#header div#auth {
+    display:inline;
+    position:absolute;
+    top:11px;
+    right:0px;
+    margin-right: 200px;
+}
+
 #key-menu {
 	background: #B2C1C8 url("../../images/header-bottom.gif") 0 100% no-repeat;
 	padding: 0 0 10px 0;
diff --git a/webtools/addons/public/htdocs/js/auth.js b/webtools/addons/public/htdocs/js/auth.js
index c7f1a6f5026..0b1eafbf007 100644
--- a/webtools/addons/public/htdocs/js/auth.js
+++ b/webtools/addons/public/htdocs/js/auth.js
@@ -9,13 +9,8 @@ function addUsernameToHeader()
     
     if (username && username.length > 0) {
     
-        var authdiv = document.createElement('div');
+        document.writeln('<div id="auth">Logged in as: ' + htmlEntities(username) + '</div>');
 
-        authdiv.setAttribute('id','auth');
-
-        authdiv.innerHTML = 'Logged in as: ' + htmlEntities(username);
-
-        document.getElementById('header').appendChild(authdiv);
     }
 }
 
diff --git a/webtools/addons/public/tpl/inc/wrappers/default-header.tpl b/webtools/addons/public/tpl/inc/wrappers/default-header.tpl
index 0bd753cff91..355620d2f59 100644
--- a/webtools/addons/public/tpl/inc/wrappers/default-header.tpl
+++ b/webtools/addons/public/tpl/inc/wrappers/default-header.tpl
@@ -40,6 +40,12 @@
         <h1><a href="{$config.webpath}/?app=firefox" title="Return to home page" accesskey="1"><img src="{$config.webpath}/images/title-firefox.gif" width="276" height="54" alt="Firefox Add-ons Beta"></a></h1>
 {/if}
 
+<script type="text/javascript">
+//<![CDATA[
+    addUsernameToHeader();
+//]]>
+</script>
+
 		<form id="search" method="get" action="{$config.webpath}/search.php" title="Search Mozilla Update">
 		<div>
 		<label for="q" title="Search Mozilla Update">search:</label>
@@ -64,13 +70,6 @@
 </div>
 <!-- end header -->
 
-<script type="text/javascript">
-//<![CDATA[
-    addUsernameToHeader();
-//]]>
-</script>
-
-
 <hr class="hide">
 
 {if $systemMessage}
diff --git a/webtools/addons/public/tpl/inc/wrappers/nonav-header.tpl b/webtools/addons/public/tpl/inc/wrappers/nonav-header.tpl
index 2fa4e4ad2f1..b46925b1ac6 100644
--- a/webtools/addons/public/tpl/inc/wrappers/nonav-header.tpl
+++ b/webtools/addons/public/tpl/inc/wrappers/nonav-header.tpl
@@ -39,6 +39,12 @@
         <h1><a href="{$config.webpath}/firefox/" title="Return to home page" accesskey="1"><img src="{$config.webpath}/images/title-firefox.gif" width="276" height="54" alt="Firefox Add-ons Beta"></a></h1>
 {/if}
 
+<script type="text/javascript">
+//<![CDATA[
+    addUsernameToHeader();
+//]]>
+</script>
+
 		<form id="search" method="get" action="{$config.webpath}/search.php" title="Search Mozilla Update">
 		<div>
 		<label for="q" title="Search Mozilla Update">search:</label>
@@ -63,13 +69,6 @@
 </div>
 <!-- end header -->
 
-<script type="text/javascript">
-//<![CDATA[
-    addUsernameToHeader();
-//]]>
-</script>
-
-
 <hr class="hide">
 
 {if $systemMessage}