diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
index 3efcf944d..e058dacf2 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
@@ -6,7 +6,7 @@
       <h4 class="brand"><a href="index.html">Archiva</a></h4>
       <ul class="nav secondary-nav">
         <li id="create-admin-link" style="display: none">
-          <a href="#" onclick="adminCreateBox();">Admin User Creation</a>
+          <a href="#" onclick="adminCreateBox();">${$.i18n.prop('create.admin.page.link')}</a>
         </li>
         <li id="login-link" style="display: none">
           <a href="#" onclick="loginBox();">
@@ -14,7 +14,7 @@
           </a>
         </li>
         <li id="change-password-link" style="">
-          <a href="#" onclick="editUserDetailsBox();">Edit Informations</a>
+          <a href="#" onclick="editUserDetailsBox();">${$.i18n.prop('edit.details')}</a>
         </li>
         <li id="logout-link" style="display: none">
           <a href="#" onclick="logout();">
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
index 6366dd159..0bb3d60fe 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html
@@ -10,13 +10,13 @@
           <div class="clearfix">
             <label for="user-login-form-username">${username}</label>
             <div class="input">
-              <input type="text" id="user-login-form-username" name="user-login-form-username" class="required" value="admin"/>
+              <input type="text" id="user-login-form-username" name="user-login-form-username" class="required" />
             </div>
           </div>
           <div class="clearfix">
             <label for="user-login-form-password">${password}</label>
             <div class="input">
-              <input type="password" id="user-login-form-password" name="user-login-form-password" class="required" value="admin123"/>
+              <input type="password" id="user-login-form-password" name="user-login-form-password" class="required" />
             </div>
           </div>
         </fieldset>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
index 7e7086ab3..382ab15fa 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
@@ -200,7 +200,7 @@ $(function() {
    * view for admin user creation
    */
   adminUserViewModel=function() {
-    this.user = new user("admin","aze123","aze123", "the admin");
+    this.user = new user("admin","","", "the administrator");
   }
 
   /**