diff --git a/src/js/controllers/preferencesEmail.js b/src/js/controllers/preferencesEmail.js
index 1fb89216a..c916e6570 100644
--- a/src/js/controllers/preferencesEmail.js
+++ b/src/js/controllers/preferencesEmail.js
@@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('preferencesEmailController',
   var walletId = wallet.credentials.walletId;
 
   var config = configService.getSync();
-  config.amailFor = config.amailFor || {};
+  config.emailFor = config.emailFor || {};
   $scope.email = config.emailFor && config.emailFor[walletId];
 
   $scope.save = function(form) {
diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js
index 033eadd55..9994be0dd 100644
--- a/src/js/controllers/walletDetails.js
+++ b/src/js/controllers/walletDetails.js
@@ -117,7 +117,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
     walletService.recreate();
   };
 
-  $scope.updateTxHistory = function() {
+  $scope.updateTxHistory = function(cb) {
 
     if ($scope.updatingTxHistory) return;
 
@@ -152,7 +152,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
         $timeout(function() {
           $scope.$apply();
         }, 1);
-        return;
+        return cb();
       });
     });
   };
@@ -172,7 +172,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
 
   $scope.updateAll = function(cb)  {
     $scope.updateStatus(false);
-    $scope.updateTxHistory();
+    $scope.updateTxHistory(cb);
   }
 
   $scope.hideToggle = function() {