diff --git a/public/views/includes/password.html b/public/views/includes/password.html
index 3866c86f4..32249e1f9 100644
--- a/public/views/includes/password.html
+++ b/public/views/includes/password.html
@@ -16,18 +16,23 @@
 
     <div class="input m20t">
       <input type="password" placeholder="{{'Your password'|translate}}"
-      id="passwordInput" name="password" ng-model="pass.password">
+      id="passwordInput" name="password" ng-model="password">
     </div>
   </div>
   <div class="row">
     <div class="small-6 columns">
-      <button class="round small-6 columns outline dark-gray expand"  ng-click="pass.close(index.askPassword.callback)" translate>
+      <button 
+        class="round small-6 columns outline dark-gray expand" 
+        ng-click="pass.close(index.askPassword.callback)" 
+        ng-disabled="pass.loading" translate>
         CANCEL
       </button>
     </div>
 
     <div class="small-6 columns">
-      <button class="round expand" ng-click="pass.set(index.askPassword.isSetup, index.askPassword.callback)" ng-disabled="!pass.password"
+      <button class="round expand" 
+              ng-click="pass.set(index.askPassword.isSetup, index.askPassword.callback)" 
+              ng-disabled="!password || pass.loading"
         ng-style="{'background-color':index.backgroundColor}">
         <span ng-if="index.askPassword.isSetup" translate>SET</span>
         <span ng-if="!index.askPassword.isSetup">OK</span>
diff --git a/src/js/controllers/password.js b/src/js/controllers/password.js
index 8c9c2b124..7d49654c6 100644
--- a/src/js/controllers/password.js
+++ b/src/js/controllers/password.js
@@ -3,42 +3,41 @@
 angular.module('copayApp.controllers').controller('passwordController',
   function($rootScope, $scope, $timeout, profileService, notification, go, gettext) {
 
-    var self = this;
-
     var pass1;
 
-    self.isVerification = false;
+    this.isVerification = false;
 
     document.getElementById("passwordInput").focus();
 
-    self.close = function(cb) {
+    this.close = function(cb) {
       return cb('No password given');
     };
 
-    self.set = function(isSetup, cb) {
-      self.error = false;
-
-      if (isSetup && !self.isVerification) {
-        document.getElementById("passwordInput").focus();
-        self.isVerification = true;
-        pass1 = self.password;
-        self.password = null;
-        $timeout(function() {
-          $rootScope.$apply();
-        })
-        return;
-      }
-      if (isSetup) {
-        if (pass1 != self.password) {
-          self.error = gettext('Passwords do not match');
-          self.isVerification = false;
-          self.password = null;
-          pass1 = null;
+    this.set = function(isSetup, cb) {
+      this.loading = true;
+      this.error = false;
+      
+      var self = this;
 
+      $timeout(function() {
+        if (isSetup && !self.isVerification) {
+          self.loading = false;
+          document.getElementById("passwordInput").focus();
+          self.isVerification = true;
+          pass1 = $scope.password;
+          $scope.password = null;
           return;
         }
-      }
-      return cb(null, self.password);
+        if (isSetup && pass1 != $scope.password) {
+          self.loading = false;
+          self.error = gettext('Passwords do not match');
+          self.isVerification = false;
+          $scope.password = null;
+          pass1 = null;
+          return;
+        }
+        return cb(null, $scope.password);
+      }, 100);
     };
 
-  });
\ No newline at end of file
+  });