diff --git a/app/code/community/Buckaroo/Buckaroo3Extended/controllers/NotifyController.php b/app/code/community/Buckaroo/Buckaroo3Extended/controllers/NotifyController.php
index 718db92..c038395 100644
--- a/app/code/community/Buckaroo/Buckaroo3Extended/controllers/NotifyController.php
+++ b/app/code/community/Buckaroo/Buckaroo3Extended/controllers/NotifyController.php
@@ -292,6 +292,8 @@ protected function _processPush()
 
     public function returnAction()
     {
+        Mage::helper('buckaroo3extended')->devLog(__METHOD__, 1);
+
         if (!$this->validatePostData()) {
             return false;
         }
@@ -341,6 +343,17 @@ public function returnAction()
 
         $this->_order = Mage::getModel('sales/order')->loadByIncrementId($orderId);
 
+        Mage::helper('buckaroo3extended')->devLog(
+            __METHOD__, 2, [$orderId, $this->_order->getQuoteId(), $this->_order->getEntityId()]
+        );
+
+        $checkoutSingleton = Mage::getModel('checkout/type_onepage');
+        $session = $checkoutSingleton->getCheckout();
+        $session->setLastSuccessQuoteId($this->_order->getQuoteId());
+        $session->setLastQuoteId($this->_order->getQuoteId());
+        $session->setLastOrderId($this->_order->getEntityId());
+        $session->setLastRealOrderId($orderId);
+
         $this->_paymentCode = $this->_order->getPayment()->getMethod();
 
         $debugEmail = 'Payment code: ' . $this->_paymentCode . "\n\n";