diff --git a/src/js/controllers/onboarding/backupWarning.js b/src/js/controllers/onboarding/backupWarning.js
index c1f99f516..cb4aa4934 100644
--- a/src/js/controllers/onboarding/backupWarning.js
+++ b/src/js/controllers/onboarding/backupWarning.js
@@ -10,9 +10,7 @@ angular.module('copayApp.controllers').controller('backupWarningController', fun
 
     $scope.close = function() {
       backupWarningPopup.close();
-      $state.go('onboarding.backup', {
-        fromOnboarding: true
-      })
+      $state.go('onboarding.backup');
     };
   }
 });
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/routes.js b/src/js/routes.js
index d513e287c..501d46f26 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -563,9 +563,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
      */
 
     .state('onboarding', {
-        url: '/onboarding/:walletId/:fromOnboarding',
+        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',