diff --git a/PaymentMethodes/HeidelpayAbstractPaymentMethod.php b/PaymentMethodes/HeidelpayAbstractPaymentMethod.php
index 86f27d464dc..765d0acdec8 100644
--- a/PaymentMethodes/HeidelpayAbstractPaymentMethod.php
+++ b/PaymentMethodes/HeidelpayAbstractPaymentMethod.php
@@ -206,6 +206,7 @@ public function getHeidelpayUrl($quote) {
 	        $user['ADDRESS.COUNTRY'],              // Billing address country code            
 	        $user['CONTACT.EMAIL']                 // Customer mail address
 	        );
+	    $this->_heidelpayPaymentMethod->getRequest()->getCriterion()->set('guest', $user['CRITERION.GUEST']);
 	    
 	    $this->_heidelpayPaymentMethod->getRequest()->basketData(
 	        $quote->getId(),                                                               // Reference Id of your application
@@ -295,6 +296,11 @@ public function getUser($order) {
 		foreach ($billing->getStreet() as $street) {
 			$billingStreet .= $street.' ';
 		}
+		$CustomerId = $order->getCustomerId();
+		$user['CRITERION.GUEST'] = 'false';
+		if ( $CustomerId == 0) {
+		    $user['CRITERION.GUEST'] = 'true';
+		}
 	
 		$user['NAME.COMPANY'] = ($billing->getCompany() === false) ? NULL : trim($billing->getCompany());
 		$user['NAME.GIVEN']			= trim($billing->getFirstname());
diff --git a/composer.json b/composer.json
index 11953d7bb3e..833ff902aa2 100644
--- a/composer.json
+++ b/composer.json
@@ -3,19 +3,19 @@
 	"description" : "heidelpay payment extension for magento 2",
 	"require" : {
 		"php" : "~5.5.0|~5.6.0|~7.0.0",
-		"magento/module-config" : "100.*.*",
-		"magento/module-store" : "100.*.*",
-		"magento/module-checkout" : "100.*.*",
-		"magento/module-sales" : "100.*.*",
-		"magento/module-quote" : "100.*.*",
-		"magento/module-customer" : "100.*.*",
-		"magento/module-payment" : "100.*.*",
-		"magento/module-backend" : "100.*.*",
+		"magento/module-config" : "<100.2.0",
+		"magento/module-store" : "<100.2.0",
+		"magento/module-checkout" : "<100.2.0",
+		"magento/module-sales" : "<100.2.0",
+		"magento/module-quote" : "<100.2.0",
+		"magento/module-customer" : "<100.2.0",
+		"magento/module-payment" : "<100.2.0",
+		"magento/module-backend" : "<100.2.0",
 		"magento/framework" : "100.*.*",
 		"heidelpay/php-api" : "dev-master"
 	},
 	"suggest" : {
-		"magento/module-checkout-agreements" : "100.0.*"
+		"magento/module-checkout-agreements" : "<100.2.0"
 	},
 	"repositories" : [{
 			"type" : "git",
@@ -23,7 +23,7 @@
 		}
 	],
 	"type" : "magento2-module",
-	"version" : "16.10.07",
+	"version" : "16.10.17",
 	"license" : "Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file.",
 	"autoload" : {
 		"files" : [
diff --git a/etc/module.xml b/etc/module.xml
index c61334d1d00..9a3fecf4d0e 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,5 +1,5 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Heidelpay_Gateway" schema_version="16.10.7" setup_version="16.10.7">
+    <module name="Heidelpay_Gateway" schema_version="16.10.17" setup_version="16.10.17">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />