diff --git a/src/js/controllers/backup.js b/src/js/controllers/backup.js
index c301a7344..ce0cba754 100644
--- a/src/js/controllers/backup.js
+++ b/src/js/controllers/backup.js
@@ -136,7 +136,7 @@ angular.module('copayApp.controllers').controller('backupController',
           }
         }
 
-        profileService.setBackupFlag(walletClient.credentials.walletId);
+        profileService.setBackupFlag(wallet.credentials.walletId);
         return cb();
       }, 1);
     };
diff --git a/src/js/controllers/onboarding/backupWarning.js b/src/js/controllers/onboarding/backupWarning.js
index 9067b1bf6..cb4aa4934 100644
--- a/src/js/controllers/onboarding/backupWarning.js
+++ b/src/js/controllers/onboarding/backupWarning.js
@@ -10,10 +10,7 @@ angular.module('copayApp.controllers').controller('backupWarningController', fun
 
     $scope.close = function() {
       backupWarningPopup.close();
-      $state.go('wallet.backup', {
-        walletId: $stateParams.walletId,
-        fromOnboarding: true
-      })
+      $state.go('onboarding.backup');
     };
   }
 });
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/onboarding/tour.js b/src/js/controllers/onboarding/tour.js
index c5b69bde3..2590d8074 100644
--- a/src/js/controllers/onboarding/tour.js
+++ b/src/js/controllers/onboarding/tour.js
@@ -37,6 +37,7 @@ angular.module('copayApp.controllers').controller('tourController',
         ongoingProcess.set('creatingWallet', false);
         var wallet = walletClient;
         $state.go('onboarding.collectEmail', {
+          fromOnboarding: true,
           walletId: wallet.credentials.walletId
         });
       });
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: {}
     };
diff --git a/src/js/routes.js b/src/js/routes.js
index 40dde5682..501d46f26 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -272,16 +272,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('tabs.import', {
-        url: '/import/:fromOnboarding',
+        url: '/import',
         //        abstract: true,
         views: {
           'tab-home': {
             templateUrl: 'views/import.html'
           },
         },
-        params: {
-          code: null
-        },
       })
       .state('tabs.import.phrase', {
         url: '/tab-import-phrase',
@@ -566,9 +563,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
      */
 
     .state('onboarding', {
-        url: '/onboarding/:walletId',
+        url: '/onboarding',
         abstract: true,
-        template: '<ion-nav-view name="onboarding"></ion-nav-view>'
+        template: '<ion-nav-view name="onboarding"></ion-nav-view>',
+        params: {
+          walletId: null,
+          fromOnboarding: null,
+        },
       })
       .state('onboarding.welcome', {
         url: '/welcome',
@@ -618,6 +619,14 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
           }
         }
       })
+      .state('onboarding.backup', {
+        url: '/backup',
+        views: {
+          'onboarding': {
+            templateUrl: 'views/backup.html'
+          }
+        }
+      })
       .state('onboarding.disclaimer', {
         url: '/disclaimer',
         views: {
@@ -635,7 +644,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('onboarding.import', {
-        url: '/import/:fromOnboarding',
+        url: '/import',
         abstract: true,
         views: {
           'onboarding': {