diff --git a/app/assets/javascripts/controllers/lockScreen.js b/app/assets/javascripts/controllers/lockScreen.js
index 57b6e0341..d3f31b920 100644
--- a/app/assets/javascripts/controllers/lockScreen.js
+++ b/app/assets/javascripts/controllers/lockScreen.js
@@ -59,6 +59,7 @@ class LockScreenCtrl {
       this.formData.passcode,
       (success) => {
         if(!success) {
+          this.formData.passcode = null;
           this.alertManager.alert({
             text: "Invalid passcode. Please try again.",
             onClose: () => {
diff --git a/app/assets/javascripts/directives/views/accountMenu.js b/app/assets/javascripts/directives/views/accountMenu.js
index 61dd399c5..558a12b22 100644
--- a/app/assets/javascripts/directives/views/accountMenu.js
+++ b/app/assets/javascripts/directives/views/accountMenu.js
@@ -168,6 +168,7 @@ class AccountMenuCtrl extends PureCtrl {
     this.syncManager.unlockSyncing();
     await this.setFormDataState({
       status: null,
+      user_password: null
     });
     const error = response
       ? response.error
@@ -507,6 +508,15 @@ class AccountMenuCtrl extends PureCtrl {
     }
   }
 
+  hidePasswordForm() {
+    this.setFormDataState({
+      showLogin: false,
+      showRegister: false,
+      user_password: null,
+      password_conf: null
+    });
+  }
+
   hasPasscode() {
     return this.passcodeManager.hasPasscode();
   }
diff --git a/app/assets/templates/directives/account-menu.pug b/app/assets/templates/directives/account-menu.pug
index ba941abfd..edf935d8e 100644
--- a/app/assets/templates/directives/account-menu.pug
+++ b/app/assets/templates/directives/account-menu.pug
@@ -338,10 +338,7 @@
       .sk-panel-row
         .sk-p.left.neutral.faded {{self.state.appVersion}}
         a.sk-a.right(
-          ng-click=`
-            self.state.formData.showLogin = false; 
-            self.state.formData.showRegister = false;
-            `, 
+          ng-click='self.hidePasswordForm()',
           ng-if='self.state.formData.showLogin || self.state.formData.showRegister'
           )
           | Cancel