diff --git a/homeassistant/components/frontend/www_static/polymer/dialogs/ha-action-dialog.html b/homeassistant/components/frontend/www_static/polymer/dialogs/ha-dialog.html
similarity index 84%
rename from homeassistant/components/frontend/www_static/polymer/dialogs/ha-action-dialog.html
rename to homeassistant/components/frontend/www_static/polymer/dialogs/ha-dialog.html
index 31b02d965f8..2cf8de644f0 100644
--- a/homeassistant/components/frontend/www_static/polymer/dialogs/ha-action-dialog.html
+++ b/homeassistant/components/frontend/www_static/polymer/dialogs/ha-dialog.html
@@ -1,9 +1,9 @@
 <link rel="import" href="../bower_components/polymer/polymer.html">
 <link rel="import" href="../bower_components/core-style/core-style.html">
-<link rel="import" href="../bower_components/paper-dialog/paper-action-dialog.html">
+<link rel="import" href="../bower_components/paper-dialog/paper-dialog.html">
 <link rel="import" href="../bower_components/paper-dialog/paper-dialog-transition.html">
 
-<polymer-element name="ha-action-dialog" extends="paper-action-dialog">
+<polymer-element name="ha-dialog" extends="paper-dialog">
 <template>
   <core-style ref='ha-dialog'></core-style>
   <shadow></shadow>
diff --git a/homeassistant/components/frontend/www_static/polymer/dialogs/more-info-dialog.html b/homeassistant/components/frontend/www_static/polymer/dialogs/more-info-dialog.html
index a668684a98d..06cad54f632 100644
--- a/homeassistant/components/frontend/www_static/polymer/dialogs/more-info-dialog.html
+++ b/homeassistant/components/frontend/www_static/polymer/dialogs/more-info-dialog.html
@@ -1,13 +1,13 @@
 <link rel="import" href="../bower_components/polymer/polymer.html">
 
-<link rel="import" href="ha-action-dialog.html">
+<link rel="import" href="ha-dialog.html">
 <link rel="import" href="../cards/state-card-content.html">
 <link rel="import" href="../components/state-timeline.html">
 <link rel="import" href="../more-infos/more-info-content.html">
 
 <polymer-element name="more-info-dialog">
 <template>
-  <ha-action-dialog id="dialog">
+  <ha-dialog id="dialog">
     <style>
     .title-card {
       margin-bottom: 24px;
@@ -20,7 +20,7 @@
       <state-timeline stateHistory="{{stateHistory}}"></state-timeline>
       <more-info-content stateObj="{{stateObj}}"></more-info-content>
     </div>
-  </ha-action-dialog>
+  </ha-dialog>
 
 </template>
 <script>
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 45d08da434c..5e1eea79623 100644
--- a/homeassistant/components/frontend/www_static/polymer/layouts/login-form.html
+++ b/homeassistant/components/frontend/www_static/polymer/layouts/login-form.html
@@ -83,12 +83,12 @@
       this.stopListeningToStores();
     },
 
-    authChangeListener: function() {
-      this.isValidating = this.authStore.isValidating();
-      this.isLoggedIn = this.authStore.isLoggedIn();
+    authStoreChanged: function(authStore) {
+      this.isValidating = authStore.isValidating();
+      this.isLoggedIn = authStore.isLoggedIn();
       this.spinnerMessage = this.isValidating ? this.MSG_VALIDATING : this.MSG_LOADING_DATA;
 
-      if (this.authStore.wasLastAttemptInvalid()) {
+      if (authStore.wasLastAttemptInvalid()) {
         this.$.passwordDecorator.error = this.authStore.getLastAttemptMessage();
         this.$.passwordDecorator.isInvalid = true;
       }