diff --git a/src/js/controllers/onboarding/collectEmail.js b/src/js/controllers/onboarding/collectEmail.js
index 220c349e5..b5dbfc739 100644
--- a/src/js/controllers/onboarding/collectEmail.js
+++ b/src/js/controllers/onboarding/collectEmail.js
@@ -1,22 +1,33 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $stateParams, profileService, walletService, platformInfo) {
+angular.module('copayApp.controllers').controller('collectEmailController', function($scope, $state, $stateParams, profileService, configService, walletService, platformInfo) {
 
   var isCordova = platformInfo.isCordova;
   var isWP = platformInfo.isWP;
   var usePushNotifications = isCordova && !isWP;
 
+  var wallet = profileService.getWallet($stateParams.walletId);
+  var walletId = wallet.credentials.walletId;
+
+  var config = configService.getSync();
+  config.emailFor = config.emailFor || {};
+  $scope.email = config.emailFor && config.emailFor[walletId];
+
   $scope.save = function(form) {
-    var wallet = profileService.getWallet($stateParams.walletId);
-    var email = $scope.email || '';
+    var opts = {
+      emailFor: {}
+    };
+    opts.emailFor[walletId] = $scope.email;
 
     walletService.updateRemotePreferences(wallet, {
-      email: email,
+      email: $scope.email,
     }, function(err) {
       if (err) $log.warn(err);
-      if (!usePushNotifications) $state.go('onboarding.backupRequest');
-      else $state.go('onboarding.notifications');
+      configService.set(opts, function(err) {
+        if (err) $log.warn(err);
+        if (!usePushNotifications) $state.go('onboarding.backupRequest');
+        else $state.go('onboarding.notifications');
+      });
     });
   };
-
 });
diff --git a/src/js/controllers/preferencesEmail.js b/src/js/controllers/preferencesEmail.js
index c916e6570..9970c1b21 100644
--- a/src/js/controllers/preferencesEmail.js
+++ b/src/js/controllers/preferencesEmail.js
@@ -11,7 +11,6 @@ angular.module('copayApp.controllers').controller('preferencesEmailController',
   $scope.email = config.emailFor && config.emailFor[walletId];
 
   $scope.save = function(form) {
-    var email = $scope.email || '';
     var opts = {
       emailFor: {}
     };