diff --git a/homeassistant/components/frontend/www_static/polymer/layouts/login-form.html b/homeassistant/components/frontend/www_static/polymer/layouts/login-form.html
index 53e5b3c9318..69da9515948 100644
--- a/homeassistant/components/frontend/www_static/polymer/layouts/login-form.html
+++ b/homeassistant/components/frontend/www_static/polymer/layouts/login-form.html
@@ -112,10 +112,20 @@
     },
 
     listeners: {
-      'passwordInput.keydown': 'passwordKeyDown',
+      'keydown': 'passwordKeyDown',
       'loginButton.click': 'validatePassword',
     },
 
+    observers: [
+      'validatingChanged(isValidating, isInvalid)',
+    ],
+
+    validatingChanged: function(isValidating, isInvalid) {
+      if (!isValidating && !isInvalid) {
+        this.$.passwordInput.value = '';
+      }
+    },
+
     isValidatingChanged: function(newVal) {
       if (!newVal) {
         this.debounce('focus-password', function() {