diff --git a/Frontend/MoptPaymentPayone/Controllers/Frontend/MoptPaymentAmazon.php b/Frontend/MoptPaymentPayone/Controllers/Frontend/MoptPaymentAmazon.php
index 3c2ec3e5..76795add 100755
--- a/Frontend/MoptPaymentPayone/Controllers/Frontend/MoptPaymentAmazon.php
+++ b/Frontend/MoptPaymentPayone/Controllers/Frontend/MoptPaymentAmazon.php
@@ -24,6 +24,8 @@ public function init()
         $this->session = Shopware()->Session();
         $this->plugin = Shopware()->Container()->get('plugins')->Frontend()->MoptPaymentPayone();
         $this->basket = Shopware()->Modules()->Basket();
+        $this->admin->sSYSTEM->_POST['sPayment'] = Shopware()->Container()->get('MoptPayoneMain')->getPaymentHelper()->getPaymentAmazonPay()->getId();
+        $this->admin->sUpdatePayment(Shopware()->Container()->get('MoptPayoneMain')->getPaymentHelper()->getPaymentAmazonPay()->getId());
     }
 
     /**
@@ -66,6 +68,7 @@ public function indexAction()
             $userData = $this->getUserData();
             $this->View()->assign('sUserData', $userData);
 
+            $this->get('modules')->Basket()->sRefreshBasket();
             $basket = $this->get('modules')->Basket()->sGetBasket();
 
             if ($this->Request()->getParam("sDispatch")) {