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 39c127e50..314a1103b 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
@@ -368,12 +368,14 @@ function(jquery,utils,i18n,jqueryValidate,ko,koSimpleGrid,purl) {
 
     var rememberMe=window.redbackRuntimeConfiguration.findPropertyValue('security.rememberme.enabled');
     $.log("rememberMe:"+rememberMe);
-    if (rememberMe!='true'){
+    if (rememberMe=='false'){
       $("#user-login-form-rememberme-label" ).hide();
       $("#user-login-form-rememberme" ).attr("disabled","true");
       if($("#user-login-form-rememberme" ).get(0 ).checked){
         $("#user-login-form-rememberme" ).get(0 ).checked=false;
       }
+      $("#user-login-form-username" ).val("");
+      $("#user-login-form-password" ).val("");
     }
 
     var userLoginForm = $("#user-login-form");