diff --git a/src/js/controllers/walletSelectorController.js b/src/js/controllers/walletSelectorController.js
index 89d77cc3e..ba5b4c418 100644
--- a/src/js/controllers/walletSelectorController.js
+++ b/src/js/controllers/walletSelectorController.js
@@ -17,7 +17,7 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
       sendFlowService.popState();
     }
 
-    var stateParams = sendFlowService.getState();
+    $scope.params = sendFlowService.getState();
 
     var config = configService.getSync().wallet.settings;
     priceDisplayAsFiat = config.priceDisplay === 'fiat';
@@ -29,18 +29,17 @@ angular.module('copayApp.controllers').controller('walletSelectorController', fu
         $scope.sendFlowTitle = gettextCatalog.getString('Wallet to Wallet Transfer');
         break;
       case 'tabs.send.destination':
-        if (stateParams.fromWalletId) {
+        if ($scope.params.fromWalletId) {
           $scope.sendFlowTitle = gettextCatalog.getString('Wallet to Wallet Transfer');
         }
         break;
       default:
-        if (!stateParams.thirdParty) {
+        if (!$scope.params.thirdParty) {
           $scope.sendFlowTitle = gettextCatalog.getString('Send');
         }
        // nop
     }
 
-    $scope.params = sendFlowService;
     $scope.coin = false; // Wallets to show (for destination screen or contacts)
     $scope.type = $scope.params['fromWalletId'] ? 'destination' : 'origin'; // origin || destination
     fromWalletId = $scope.params['fromWalletId'];
diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js
index 86c928a5e..4c2b71de8 100644
--- a/src/js/services/incomingData.js
+++ b/src/js/services/incomingData.js
@@ -447,7 +447,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
       amount: thirdPartyData.amount,
       toAddress: thirdPartyData.toAddress,
       coin: coin,
-      thirdParty: JSON.stringify(thirdPartyData)
+      thirdParty: thirdPartyData
     };
 
     // fee
@@ -455,6 +455,8 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
       stateParams.requiredFeeRate = thirdPartyData.requiredFeeRate * 1024;
     }
 
+    sendFlowService.pushState(thirdPartyData);
+
     scannerService.pausePreview();
     $state.go('tabs.send', {}, {
       'reload': true,