diff --git a/Helper/Data.php b/Helper/Data.php
index ad1f50d..4d89b8e 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -38,7 +38,7 @@
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
 
-    protected $_pluginVersion = '1.0.11';
+    protected $_pluginVersion = '1.0.12';
     protected $_pluginName = 'Wirecard/CheckoutSeamless';
 
     /**
diff --git a/README.md b/README.md
index 5a13af1..339b719 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # Wirecard Checkout Seamless extension for Magento 2
 
 [![License](https://img.shields.io/badge/license-GPLv2-blue.svg)](https://raw.githubusercontent.com/wirecard/Magento2-WCP/master/LICENSE)
-[![PHP v5.6](https://img.shields.io/badge/php-v5.5-yellow.svg)](http://www.php.net)
+[![PHP v5.6](https://img.shields.io/badge/php-v5.6-yellow.svg)](http://www.php.net)
 [![PHP v7.0](https://img.shields.io/badge/php-v7.0-yellow.svg)](http://www.php.net)
-[![Magento v2.2.1](https://img.shields.io/badge/magento-v2.2.1-green.svg)](https://magento.com/)
+[![Magento v2.2.4](https://img.shields.io/badge/magento-v2.2.4-green.svg)](https://magento.com/)
 
 Wirecard Checkout Seamless extension for Magento 2. 
 
diff --git a/composer.json b/composer.json
index 8029e49..74922a2 100644
--- a/composer.json
+++ b/composer.json
@@ -2,12 +2,12 @@
   "name": "wirecard/magento2-wcs",
   "description": "Wirecard Checkout Seamless",
   "type": "magento2-module",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "license": [
     "MIT"
   ],
   "require": {
-    "php": "~5.5.0|~5.6.0|~7.0",
+    "php": "~5.6.0|~7.0",
     "magento/magento-composer-installer": "*",
     "magento/module-checkout-agreements": "*",
     "magento/module-sales": "*",
diff --git a/view/frontend/web/js/action/set-payment-method.js b/view/frontend/web/js/action/set-payment-method.js
index 63f05c8..cffc160 100644
--- a/view/frontend/web/js/action/set-payment-method.js
+++ b/view/frontend/web/js/action/set-payment-method.js
@@ -52,6 +52,7 @@ define(
                 paymentData = quote.paymentMethod(),
                 methodeCode = quote.paymentMethod().method,
                 checkoutStartUrl = url.build('/wirecardcheckoutseamless/checkout/start', {});
+                agreementsAssigner(paymentData);
 
             /**
              * Checkout for guest and registered customer.
@@ -68,7 +69,6 @@ define(
                 };
             } else {
                 serviceUrl = urlBuilder.createUrl('/carts/mine/set-payment-information', {});
-                agreementsAssigner(paymentData);
                 payload = {
                     cartId: quote.getQuoteId(),
                     paymentMethod: paymentData,