diff --git a/Helper/Payment.php b/Helper/Payment.php
index f47e5a5d..5fde9f1f 100644
--- a/Helper/Payment.php
+++ b/Helper/Payment.php
@@ -48,7 +48,7 @@ class Payment extends \Payone\Core\Helper\Base
         PayoneConfig::METHOD_ADVANCE_PAYMENT,
         PayoneConfig::METHOD_INVOICE,
         PayoneConfig::METHOD_OBT_SOFORTUEBERWEISUNG,
-        PayoneConfig::METHOD_OBT_GIROPAY,
+        #PayoneConfig::METHOD_OBT_GIROPAY,#Giropay has been disabled, Paydirekt is now Giropay
         PayoneConfig::METHOD_OBT_EPS,
         PayoneConfig::METHOD_OBT_POSTFINANCE_EFINANCE,
         PayoneConfig::METHOD_OBT_POSTFINANCE_CARD,
diff --git a/Model/Methods/Paydirekt.php b/Model/Methods/Paydirekt.php
index db184418..3f2df516 100644
--- a/Model/Methods/Paydirekt.php
+++ b/Model/Methods/Paydirekt.php
@@ -86,8 +86,14 @@ public function getPaymentSpecificParameters(Order $oOrder)
             $aParams['add_paydata[terminal_address_streetnumber]'] = '';// IS THIS NECESSARY?
             $aParams['add_paydata[terminal_address_zip]'] = $this->shopHelper->getConfigParam('postcode', 'store_information', 'general');
             $aParams['add_paydata[terminal_id]'] = $this->shopHelper->getConfigParam('name', 'store_information', 'general');
+        }
 
+        $blSecuredOrder = (bool)$this->getCustomConfigParam('order_secured');
+        if ($blSecuredOrder === true && $this->getAuthorizationMode() == PayoneConfig::REQUEST_TYPE_PREAUTHORIZATION) { // params only available with preauth
+            $aParams['add_paydata[order_secured]'] = 'yes';
+            $aParams['add_paydata[preauthorization_validity]'] = (int)$this->getCustomConfigParam('preauthorization_validity');
         }
+
         return $aParams;
     }
 
diff --git a/Model/Source/GuaranteeTime.php b/Model/Source/GuaranteeTime.php
new file mode 100644
index 00000000..e2591776
--- /dev/null
+++ b/Model/Source/GuaranteeTime.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Payone\Core\Model\Source;
+
+use Magento\Framework\Option\ArrayInterface;
+
+class GuaranteeTime implements ArrayInterface
+{
+    /**
+     * @var int
+     */
+    protected $iAllowedDaysMin = 1;
+
+    /**
+     * @var int
+     */
+    protected $iAllowedDaysMax = 15;
+
+    /**
+     * Return allowed guarantee times
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        $aOptions = [];
+        for($i = $this->iAllowedDaysMin; $i <= $this->iAllowedDaysMax; $i ++) {
+            $aOptions[] = [
+                'value' => $i,
+                'label' => $i,
+            ];
+        }
+        return $aOptions;
+    }
+}
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 9b6e986c..593038fd 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -141,11 +141,11 @@
                     <frontend_model>Payone\Core\Block\Adminhtml\Config\Form\Field\StatusMapping</frontend_model>
                     <backend_model>Payone\Core\Model\Config\Backend\SerializedOrJson</backend_model>
                 </field>
-                <field id="payone_obt_giropay" translate="label" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
+                <!--field id="payone_obt_giropay" translate="label" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>giropay</label>
                     <frontend_model>Payone\Core\Block\Adminhtml\Config\Form\Field\StatusMapping</frontend_model>
                     <backend_model>Payone\Core\Model\Config\Backend\SerializedOrJson</backend_model>
-                </field>
+                </field Giropay has been disabled, Paydirekt is now Giropay -->
                 <field id="payone_obt_eps" translate="label" sortOrder="130" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>eps - Online-Ueberweisung</label>
                     <frontend_model>Payone\Core\Block\Adminhtml\Config\Form\Field\StatusMapping</frontend_model>
@@ -177,7 +177,7 @@
                     <backend_model>Payone\Core\Model\Config\Backend\SerializedOrJson</backend_model>
                 </field>
                 <field id="payone_paydirekt" translate="label" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Paydirekt</label>
+                    <label>Giropay</label>
                     <frontend_model>Payone\Core\Block\Adminhtml\Config\Form\Field\StatusMapping</frontend_model>
                     <backend_model>Payone\Core\Model\Config\Backend\SerializedOrJson</backend_model>
                 </field>
@@ -306,7 +306,7 @@
             <include path="Payone_Core::system/payone_advance_payment.xml"/>
             <include path="Payone_Core::system/payone_invoice.xml"/>
             <include path="Payone_Core::system/payone_obt_sofortueberweisung.xml"/>
-            <include path="Payone_Core::system/payone_obt_giropay.xml"/>
+            <!--include path="Payone_Core::system/payone_obt_giropay.xml"/ Giropay has been disabled, Paydirekt is now Giropay -->
             <include path="Payone_Core::system/payone_obt_eps.xml"/>
             <include path="Payone_Core::system/payone_obt_postfinance_efinance.xml"/>
             <include path="Payone_Core::system/payone_obt_postfinance_card.xml"/>
diff --git a/etc/adminhtml/system/payone_paydirekt.xml b/etc/adminhtml/system/payone_paydirekt.xml
index deb5a528..c8432d1f 100644
--- a/etc/adminhtml/system/payone_paydirekt.xml
+++ b/etc/adminhtml/system/payone_paydirekt.xml
@@ -26,7 +26,7 @@
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
     <group id="payone_paydirekt" translate="label" type="text" sortOrder="200" showInDefault="1" showInWebsite="1" showInStore="1">
-        <label>Paydirekt</label>
+        <label>Giropay</label>
         <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Enabled</label>
             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -40,7 +40,20 @@
             <label>Title</label>
             <config_path>payment/payone_paydirekt/title</config_path>
         </field>
-        <field id="order_status" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+        <field id="order_secured" translate="label,comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Secured order</label>
+            <comment>With a secured order, the merchant has a payment guarantee für the selected time period (max. 15 running days). Captures (partial payments) have to be done within the guarantee time period. Only available in preauthorization mode.</comment>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+        </field>
+        <field id="preauthorization_validity" translate="label,comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label>Guarantee time period</label>
+            <depends>
+                <field id="order_secured">1</field>
+            </depends>
+            <comment>With a secured order, the merchant has a payment guarantee für the selected time period (max. 15 running days). Captures (partial payments) have to be done within the guarantee time period.</comment>
+            <source_model>Payone\Core\Model\Source\GuaranteeTime</source_model>
+        </field>
+        <field id="order_status" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>New Order Status</label>
             <source_model>Magento\Sales\Model\Config\Source\Order\Status\NewStatus</source_model>
             <config_path>payment/payone_paydirekt/order_status</config_path>
diff --git a/etc/config.xml b/etc/config.xml
index 81521eb5..24b72e96 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -92,7 +92,7 @@
                 <allowspecific>0</allowspecific>
                 <group>payone</group>
             </payone_obt_sofortueberweisung>
-            <payone_obt_giropay translate="title" module="Payone_Core">
+            <!--payone_obt_giropay translate="title" module="Payone_Core">
                 <active>1</active>
                 <payment_action>Authorization</payment_action>
                 <model>Payone\Core\Model\Methods\OnlineBankTransfer\Giropay</model>
@@ -100,7 +100,7 @@
                 <title>PAYONE Giropay</title>
                 <allowspecific>0</allowspecific>
                 <group>payone</group>
-            </payone_obt_giropay>
+            </payone_obt_giropay Giropay has been disabled, Paydirekt is now Giropay -->
             <payone_obt_eps translate="title" module="Payone_Core">
                 <active>1</active>
                 <payment_action>Authorization</payment_action>
@@ -160,7 +160,7 @@
                 <payment_action>Authorization</payment_action>
                 <model>Payone\Core\Model\Methods\Paydirekt</model>
                 <order_status>pending</order_status>
-                <title>PAYONE paydirekt</title>
+                <title>PAYONE Giropay</title>
                 <allowspecific>0</allowspecific>
                 <group>payone</group>
             </payone_paydirekt>
@@ -376,7 +376,7 @@
                 <payone_invoice>{"_1338893611948_948":{"txaction":"appointed","state_status":"processing"}}</payone_invoice>
                 <payone_advance_payment>{"_1338893618715_715":{"txaction":"appointed","state_status":"pending"},"_1458214328719_719":{"txaction":"paid","state_status":"processing"}}</payone_advance_payment>
                 <payone_obt_sofortueberweisung>{"_1343137411652_152":{"txaction":"appointed","state_status":"processing"}}</payone_obt_sofortueberweisung>
-                <payone_obt_giropay>{"_1343137411652_252":{"txaction":"appointed","state_status":"processing"}}</payone_obt_giropay>
+                <!--payone_obt_giropay>{"_1343137411652_252":{"txaction":"appointed","state_status":"processing"}}</payone_obt_giropay Giropay has been disabled, Paydirekt is now Giropay -->
                 <payone_obt_eps>{"_1343137411652_352":{"txaction":"appointed","state_status":"processing"}}</payone_obt_eps>
                 <payone_obt_postfinance_efinance>{"_1343137411652_452":{"txaction":"appointed","state_status":"processing"}}</payone_obt_postfinance_efinance>
                 <payone_obt_postfinance_card>{"_1343137411652_552":{"txaction":"appointed","state_status":"processing"}}</payone_obt_postfinance_card>
@@ -481,9 +481,9 @@
             <payone_obt_sofortueberweisung>
                 <use_global>1</use_global>
             </payone_obt_sofortueberweisung>
-            <payone_obt_giropay>
+            <!--payone_obt_giropay>
                 <use_global>1</use_global>
-            </payone_obt_giropay>
+            </payone_obt_giropay Giropay has been disabled, Paydirekt is now Giropay -->
             <payone_obt_eps>
                 <use_global>1</use_global>
             </payone_obt_eps>
@@ -504,6 +504,8 @@
             </payone_barzahlen>
             <payone_paydirekt>
                 <use_global>1</use_global>
+                <order_secured>0</order_secured>
+                <preauthorization_validity>15</preauthorization_validity>
             </payone_paydirekt>
             <payone_safe_invoice>
                 <use_global>1</use_global>
diff --git a/etc/payment.xml b/etc/payment.xml
index aa2916d7..92e2fa5e 100644
--- a/etc/payment.xml
+++ b/etc/payment.xml
@@ -52,9 +52,9 @@
         <method name="payone_obt_sofortueberweisung">
             <allow_multiple_address>0</allow_multiple_address>
         </method>
-        <method name="payone_obt_giropay">
+        <!--method name="payone_obt_giropay">
             <allow_multiple_address>0</allow_multiple_address>
-        </method>
+        </method Giropay has been disabled, Paydirekt is now Giropay -->
         <method name="payone_obt_eps">
             <allow_multiple_address>0</allow_multiple_address>
         </method>
diff --git a/i18n/de_DE.csv b/i18n/de_DE.csv
index b09145d6..1f79975b 100644
--- a/i18n/de_DE.csv
+++ b/i18n/de_DE.csv
@@ -1042,6 +1042,11 @@
 "Billing address as delivery address","Rechnungsadresse als Lieferadresse"
 "Transmit the billing address as delivery address if delivery address is missing.","Rechnungsadresse bei fehlender Lieferadresse als Lieferadresse &uuml;bergeben."
 
+"Secured order","Gesicherte Vorbestellung"
+"With a secured order, the merchant has a payment guarantee für the selected time period (max. 15 running days). Captures (partial payments) have to be done within the guarantee time period. Only available in preauthorization mode.","Bei einer gesicherten Vorbestellung wird dem Händler eine Zahlunqsgarantie für den gewählten Zeitraum (maximal 15 Kalendertage) gewährt. Captures (Teilzahlungen) müssen immer innerhalb des Garantiezeitraums ausgeruhrt werden. Nur im Vorautorisierung Modus verfügbar."
+"Guarantee time period","Garantiezeitraum"
+"Desired guarantee time period (max. 15 running days) für a secured order.","Gewünschter Garantiezeitraum (maximal 15 Kalendertage) für eine gesicherte Vorbestellung."
+
 "PayPal Express Enabled","PayPal Express aktiviert"
 "An error occured during the PayPal Express transaction.","Während der PayPal Express Transaktion ist ein Fehler aufgetreten."
 "Please sign in to check out.","Bitte loggen Sie sich ein für den Einkauf."
diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
index fa56efdb..3e546985 100644
--- a/view/frontend/layout/checkout_index_index.xml
+++ b/view/frontend/layout/checkout_index_index.xml
@@ -73,9 +73,9 @@
                                                                         <item name="payone_obt_sofortueberweisung" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
-                                                                        <item name="payone_obt_giropay" xsi:type="array">
+                                                                        <!--item name="payone_obt_giropay" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
-                                                                        </item>
+                                                                        </item Giropay has been disabled, Paydirekt is now Giropay -->
                                                                         <item name="payone_obt_eps" xsi:type="array">
                                                                             <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
diff --git a/view/frontend/web/js/view/payment/payone-payments.js b/view/frontend/web/js/view/payment/payone-payments.js
index ee500b09..fc9d93ff 100644
--- a/view/frontend/web/js/view/payment/payone-payments.js
+++ b/view/frontend/web/js/view/payment/payone-payments.js
@@ -60,10 +60,10 @@ define(
                 type: 'payone_obt_sofortueberweisung',
                 component: 'Payone_Core/js/view/payment/method-renderer/obt_sofortueberweisung-method'
             },
-            {
+            /*{
                 type: 'payone_obt_giropay',
                 component: 'Payone_Core/js/view/payment/method-renderer/obt_giropay-method'
-            },
+            }, Giropay has been disabled, Paydirekt is now Giropay */
             {
                 type: 'payone_obt_eps',
                 component: 'Payone_Core/js/view/payment/method-renderer/obt_eps-method'