diff --git a/Gruntfile.js b/Gruntfile.js
index ab803c3cc..a4c4cbf0f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -5,7 +5,7 @@ module.exports = function(grunt) {
     watch: {
       haml: {
         files: ['app/assets/templates/**/*.haml'],
-        tasks: ['newer:haml', 'ngtemplates', 'concat:app', 'babel', 'browserify', 'concat:dist'],
+        tasks: ['newer:haml', 'ngtemplates', 'concat:app', 'babel', 'browserify', 'concat:dist', 'ngAnnotate'],
         options: {
           spawn: false,
         },
diff --git a/app/assets/javascripts/app/directives/views/componentView.js b/app/assets/javascripts/app/directives/views/componentView.js
index 459fdb3ad..de807f819 100644
--- a/app/assets/javascripts/app/directives/views/componentView.js
+++ b/app/assets/javascripts/app/directives/views/componentView.js
@@ -85,7 +85,7 @@ class ComponentView {
           $timeout(() => {
             $scope.loading = false;
             $scope.issueLoading = false;
-          }, 5)
+          }, 7)
         };
       }
     }
diff --git a/app/assets/javascripts/app/directives/views/passwordWizard.js b/app/assets/javascripts/app/directives/views/passwordWizard.js
index f93bed6d5..7c78e2cbb 100644
--- a/app/assets/javascripts/app/directives/views/passwordWizard.js
+++ b/app/assets/javascripts/app/directives/views/passwordWizard.js
@@ -102,6 +102,9 @@ class PasswordWizard {
       if(preprocessor) {
         preprocessor(() => {
           next();
+        }, () => {
+          // on fail
+          $scope.isContinuing = false;
         })
       } else {
         next();
@@ -114,7 +117,7 @@ class PasswordWizard {
 
     $scope.preprocessorForStep = function(step) {
       if(step == PasswordStep) {
-        return (callback) => {
+        return (onSuccess, onFail) => {
           $scope.showSpinner = true;
           $scope.continueTitle = "Generating Keys...";
           $timeout(() => {
@@ -122,7 +125,9 @@ class PasswordWizard {
               $scope.showSpinner = false;
               $scope.continueTitle = DefaultContinueTitle;
               if(success) {
-                callback();
+                onSuccess();
+              } else {
+                onFail && onFail();
               }
             });
           })
diff --git a/app/assets/templates/directives/password-wizard.html.haml b/app/assets/templates/directives/password-wizard.html.haml
index 207c9e8c9..e2a004e35 100644
--- a/app/assets/templates/directives/password-wizard.html.haml
+++ b/app/assets/templates/directives/password-wizard.html.haml
@@ -14,8 +14,7 @@
                 %p.sk-p
                   Changing your password involves changing your encryption key, which requires your data to be re-encrypted and synced.
                   If you have many items, syncing your data can take several minutes.
-                %p.sk-p
-                  %strong You must keep the application window open during this process.
+                %p.sk-p.sk-panel-row You must keep the application window open during this process.
               %div{"ng-if" => "securityUpdate"}
                 %p.sk-p
                   A new update is available for your account. Updates address improvements and enhancements to our security specification.
@@ -75,7 +74,7 @@
               %div{"ng-if" => "step == 4"}
                 %p.sk-panel-row
                   Your data is being re-encrypted with your new keys and synced to your account.
-                %p.sk-panel-row.danger
+                %p.sk-panel-row.danger{"ng-if" => "lockContinue"}
                   Do not close this window until this process completes.
 
                 .sk-panel-row
@@ -89,14 +88,14 @@
 
               %div{"ng-if" => "step == 5"}
                 %div{"ng-if" => "changePassword"}
-                  %p.sk-panel-row Your password has been successfully changed.
+                  %p.sk-p.sk-panel-row.info-i Your password has been successfully changed.
                 %div{"ng-if" => "securityUpdate"}
-                  %p.sk-panel-row
+                  %p.sk-p.sk-panel-row
                     The security update has been successfully applied to your account.
-                %p.sk-panel-row
-                  %strong Please ensure you are running the latest version of Standard Notes on all platforms to ensure maximum compatibility.
+                %p.sk-p.sk-panel-row
+                  Please ensure you are running the latest version of Standard Notes on all platforms to ensure maximum compatibility.
 
-                %p.sk-panel-row You may now sign back in on all your devices and close this window.
+                %p.sk-p.sk-panel-row You may now sign back in on all your devices and close this window.
 
           .sk-panel-footer
             .empty