diff --git a/views/blocks/page/checkout/checkout_order_btn_submit_bottom.tpl b/views/blocks/page/checkout/checkout_order_btn_submit_bottom.tpl
index e168318af..0ebde48a2 100644
--- a/views/blocks/page/checkout/checkout_order_btn_submit_bottom.tpl
+++ b/views/blocks/page/checkout/checkout_order_btn_submit_bottom.tpl
@@ -1,9 +1,8 @@
 [{assign var="payment" value=$oView->getPayment()}]
 [{if "oscpaypal_acdc" == $payment->getId() || "oscpaypal" == $payment->getId()}]
     <div class="float-right ml-5 mt-3">
-        <input type="checkbox" name="vaultPayment" id="oscPayPalVaultPayment">
+        <input type="hidden" name="vaultPayment" id="oscPayPalVaultPayment" value="">
         <input type="hidden" name="oscPayPalPaymentTypeForVaulting" value="[{$payment->getId()}]">
-        <label for="oscPayPalVaultPayment"><strong>[{oxmultilang ident="OSC_PAYPAL_VAULTING_SAVE"}]</strong></label>
     </div>
 [{/if}]
 [{if "oscpaypal_pui" == $payment->getId()}]
diff --git a/views/blocks/page/checkout/shipping_and_payment.tpl b/views/blocks/page/checkout/shipping_and_payment.tpl
index e972cc8e4..e06cadc11 100644
--- a/views/blocks/page/checkout/shipping_and_payment.tpl
+++ b/views/blocks/page/checkout/shipping_and_payment.tpl
@@ -1,4 +1,33 @@
 [{assign var="payment" value=$oView->getPayment()}]
+[{if "oscpaypal_acdc" == $payment->getId() || "oscpaypal" == $payment->getId()}]
+    <script>
+        function setVaultingCheckbox() {
+            let checkbox = document.getElementById("oscPayPalVaultPaymentCheckbox");
+            let vaultingInput = document.getElementById("oscPayPalVaultPayment");
+
+            if (checkbox.checked) {
+                vaultingInput.value = "true";
+            }else {
+                vaultingInput.value = "";
+            }
+        }
+
+        window.onload = function () {
+            let cardContent = document.querySelector('#orderPayment form .card .card-body');
+            let checkboxDiv = document.getElementById("vaultingCheckboxDiv");
+
+            cardContent.appendChild(checkboxDiv);
+            checkboxDiv.style.display = "block";
+        }
+    </script>
+
+    <div id="vaultingCheckboxDiv" style="display: none;">
+        <br>
+        <input type="checkbox" id="oscPayPalVaultPaymentCheckbox" onclick="setVaultingCheckbox()">
+        <label for="oscPayPalVaultPaymentCheckbox">[{oxmultilang ident="OSC_PAYPAL_VAULTING_SAVE"}]</label>
+    </div>
+[{/if}]
+
 [{if "oscpaypal_acdc" == $payment->getId() || "oscpaypal_pui" == $payment->getId() || $vaultedPaymentDescription}]
     [{if $oViewConf->isFlowCompatibleTheme()}]
         [{include file="modules/osc/paypal/shipping_and_payment_flow.tpl"}]