diff --git a/metadata.php b/metadata.php
index 9976a9d2..7320da3f 100755
--- a/metadata.php
+++ b/metadata.php
@@ -138,8 +138,8 @@
         '@osc_paypal/frontend/shared/applepay.tpl' => 'views/smarty/frontend/shared/applepay.tpl',
 
         //PSPAYPAL-680 Vaulting
-        '@osc_paypal/frontend/shared/account_vaulting_paypal.tpl'    => 'views/smarty/frontend/shared/page/account/account_vaulting_paypal.tpl',
-        '@osc_paypal/frontend/shared/account_vaulting_card.tpl'      => 'views/smarty/frontend/shared/page/account/account_vaulting_card.tpl',
+        '@osc_paypal/frontend/account_vaulting_paypal.tpl'    => 'views/smarty/frontend/shared/page/account/account_vaulting_paypal.tpl',
+        '@osc_paypal/frontend/account_vaulting_card.tpl'      => 'views/smarty/frontend/shared/page/account/account_vaulting_card.tpl',
         '@osc_paypal/frontend/shared/vaultedpaymentsources.tpl'      => 'views/smarty/frontend/shared/vaultedpaymentsources.tpl',
         '@osc_paypal/frontend/flow/vaultedpaymentsources.tpl' => 'views/smarty/frontend/flow/vaulting/vaultedpaymentsources.tpl',
         '@osc_paypal/frontend/wave/vaultedpaymentsources.tpl' => 'views/smarty/frontend/wave/vaulting/vaultedpaymentsources.tpl',
diff --git a/src/Controller/PayPalVaultingCardController.php b/src/Controller/PayPalVaultingCardController.php
index 3b02826e..61341907 100644
--- a/src/Controller/PayPalVaultingCardController.php
+++ b/src/Controller/PayPalVaultingCardController.php
@@ -21,7 +21,7 @@ public function render()
         $this->_aViewData['vaultingUserId'] = oxNew(Config::class)->getUserIdForVaulting();
         $moduleSettings = $this->getServiceFromContainer(ModuleSettings::class);
         if ($moduleSettings->isVaultingAllowedForACDC()) {
-            $this->_sThisTemplate = '@osc_paypal/frontend/shared/account_vaulting_card';
+            $this->_sThisTemplate = '@osc_paypal/frontend/account_vaulting_card';
         }
 
         return parent::render();
diff --git a/src/Controller/PayPalVaultingController.php b/src/Controller/PayPalVaultingController.php
index 7708e767..dbb89349 100644
--- a/src/Controller/PayPalVaultingController.php
+++ b/src/Controller/PayPalVaultingController.php
@@ -21,7 +21,7 @@ public function render()
         $this->_aViewData['vaultingUserId'] = oxNew(Config::class)->getUserIdForVaulting();
         $moduleSettings = $this->getServiceFromContainer(ModuleSettings::class);
         if ($moduleSettings->isVaultingAllowedForPayPal()) {
-            $this->_sThisTemplate = '@osc_paypal/frontend/shared/account_vaulting_paypal';
+            $this->_sThisTemplate = '@osc_paypal/frontend/account_vaulting_paypal';
         }
 
         return parent::render();
diff --git a/views/smarty/frontend/blocks/page/account/account_vaulting_card.tpl b/views/smarty/frontend/blocks/page/account/account_vaulting_card.tpl
deleted file mode 100644
index ad44237b..00000000
--- a/views/smarty/frontend/blocks/page/account/account_vaulting_card.tpl
+++ /dev/null
@@ -1,102 +0,0 @@
-[{capture append="oxidBlock_content"}]
-    [{assign var="template_title" value="OSC_PAYPAL_VAULTING_MENU_CARD"|oxmultilangassign}]
-
-    <h1 class="page-header">[{oxmultilang ident="OSC_PAYPAL_VAULTING_MENU_CARD"}]</h1>
-
-    <div class="card">
-        <div class="card-header">
-            <h3 class="card-title">[{oxmultilang ident="OSC_PAYPAL_VAULTING_SAVE_INSTRUCTION_CARD"}]</h3>
-        </div>
-        <div class="card-body">
-            <p id="PayPalVaultingSuccess" class="alert alert-success" style="display: none">[{oxmultilang ident="OSC_PAYPAL_VAULTING_SUCCESS"}]</p>
-            <p id="PayPalVaultingFailure" class="alert alert-danger" style="display: none">[{oxmultilang ident="OSC_PAYPAL_VAULTING_ERROR"}]</p>
-            <div class='card_container' id="payPalVaultingCardContainer">
-                <div id='card-holder-name'></div>
-                <div id='card-number'></div>
-                <div id='expiration-date'></div>
-                <div id='cvv'></div>
-                <button value='submit' id='submit' class="btn btn-primary">[{oxmultilang ident="OSC_PAYPAL_VAULTING_CARD_SAVE"}]</button>
-            </div>
-        </div>
-    </div>
-
-    <script>
-        window.onload = function () {
-            const cardFields = paypal.CardFields({
-            createVaultSetupToken: async () => {
-                // Call your server API to generate a vaultSetupToken
-                // and return it here as a string
-                const result = await fetch(
-                    "[{oxgetseourl ident=$oViewConf->getGenerateSetupTokenLink(true)}]",
-                    { method: "POST"
-                })
-                const { id } = await result.json();
-                return id;
-            },
-            onApprove: async (data) => {
-                // Only for 3D Secure
-                if(data.liabilityShift){
-                 // Handle liability shift
-                }
-
-                const result = await fetch(
-                    "[{oxgetseourl ident=$oViewConf->getGeneratePaymentTokenLink()}]"+data.vaultSetupToken,
-                    {
-                        method: "POST",
-                        body: JSON.stringify(data)
-                    }
-                );
-                const status = await result.json();
-
-                if(status.state !== "SUCCESS") {
-                    //log error?
-                }
-            },
-            onError: (error) =>
-                console.error('Something went wrong:', error)
-            })
-
-
-            // Check eligibility and display advanced credit and debit card payments
-            if (cardFields.isEligible()) {
-                cardFields.NameField().render("#card-holder-name");
-                cardFields.NumberField().render("#card-number");
-                cardFields.ExpiryField().render("#expiration-date");
-                cardFields.CVVField().render("#cvv");
-            } else {
-                // Handle the workflow when credit and debit cards are not available
-            }
-
-            const submitButton = document.getElementById("submit");
-            submitButton.addEventListener("click", () => {
-                cardFields
-                    .submit()
-                    .then(() => {
-                        showSuccessMessage();
-                    })
-                    .catch((error) => {
-                        showFailureMessage();
-                    });
-            });
-
-            function showSuccessMessage() {
-                $('#payPalVaultingCardContainer').hide();
-                $('#PayPalVaultingSuccess').show();
-            }
-
-            function showFailureMessage() {
-                $('#PayPalVaultingFailure').show();
-            }
-        }
-    </script>
-    <div id="payments-sdk__contingency-lightbox"></div>
-
-    [{include file="@osc_paypal/frontend/shared/vaultedpaymentsources.tpl"}]
-
-    [{insert name="oxid_tracker" title=$template_title}]
-[{/capture}]
-
-[{capture append="oxidBlock_sidebar"}]
-    [{include file="page/account/inc/account_menu.tpl" active_link="oscPayPalVaultingCard"}]
-[{/capture}]
-[{include file="layout/page.tpl" sidebar="Left"}]
\ No newline at end of file
diff --git a/views/smarty/frontend/blocks/page/account/account_vaulting_paypal.tpl b/views/smarty/frontend/blocks/page/account/account_vaulting_paypal.tpl
deleted file mode 100644
index 4eb45776..00000000
--- a/views/smarty/frontend/blocks/page/account/account_vaulting_paypal.tpl
+++ /dev/null
@@ -1,67 +0,0 @@
-[{capture append="oxidBlock_content"}]
-    [{assign var="template_title" value="OSC_PAYPAL_VAULTING_MENU"|oxmultilangassign}]
-
-    <h1 class="page-header">[{oxmultilang ident="OSC_PAYPAL_VAULTING_MENU"}]</h1>
-
-    <div class="card">
-        <div class="card-header">
-            <h3 class="card-title">[{oxmultilang ident="OSC_PAYPAL_VAULTING_SAVE_INSTRUCTION"}]</h3>
-        </div>
-        <div class="card-body">
-            <p id="PayPalVaultingSuccess" class="alert alert-success" style="display: none">[{oxmultilang ident="OSC_PAYPAL_VAULTING_SUCCESS"}]</p>
-            <p id="PayPalVaultingFailure" class="alert alert-danger" style="display: none">[{oxmultilang ident="OSC_PAYPAL_VAULTING_ERROR"}]</p>
-            <div id="PayPalButtonVaulting" class="paypal-button-container paypal-button-wrapper large"></div>
-        </div>
-    </div>
-    <script>
-        window.onload = function () {
-            paypal.Buttons({
-                               createVaultSetupToken: async () => {
-                                   const result = await fetch(
-                                       "[{oxgetseourl ident=$oViewConf->getGenerateSetupTokenLink()}]",
-                                       { method: "POST"
-                                       })
-                                   const { id } = await result.json();
-                                   return id;
-                               },
-                               onApprove: async ({ vaultSetupToken }) => {
-                                   const result = await fetch(
-                                       "[{oxgetseourl ident=$oViewConf->getGeneratePaymentTokenLink()}]"+vaultSetupToken,
-                                       {method: 'POST'
-                                       })
-                                   const status = await result.json();
-
-                                   if(status.state === "SUCCESS") {
-                                       showSuccessMessage();
-                                   }else {
-                                       showFailureMessage();
-                                   }
-                               },
-                               onError: (error) => {
-                                   //TODO
-                               },
-                               style: {
-                                   label: 'checkout'
-                               }
-                           }).render("#PayPalButtonVaulting");
-
-            function showSuccessMessage() {
-                $('#PayPalButtonVaulting').hide();
-                $('#PayPalVaultingSuccess').show();
-            }
-
-            function showFailureMessage() {
-                $('#PayPalVaultingFailure').show();
-            }
-        };
-    </script>
-
-    [{include file="@osc_paypal/frontend/shared/vaultedpaymentsources.tpl"}]
-
-    [{insert name="oxid_tracker" title=$template_title}]
-[{/capture}]
-
-[{capture append="oxidBlock_sidebar"}]
-    [{include file="page/account/inc/account_menu.tpl" active_link="oscPayPalVaulting"}]
-[{/capture}]
-[{include file="layout/page.tpl" sidebar="Left"}]
\ No newline at end of file
diff --git a/views/smarty/frontend/shared/page/account/account_vaulting_paypal.tpl b/views/smarty/frontend/shared/page/account/account_vaulting_paypal.tpl
index 4eb45776..63583fe0 100644
--- a/views/smarty/frontend/shared/page/account/account_vaulting_paypal.tpl
+++ b/views/smarty/frontend/shared/page/account/account_vaulting_paypal.tpl
@@ -16,34 +16,34 @@
     <script>
         window.onload = function () {
             paypal.Buttons({
-                               createVaultSetupToken: async () => {
-                                   const result = await fetch(
-                                       "[{oxgetseourl ident=$oViewConf->getGenerateSetupTokenLink()}]",
-                                       { method: "POST"
-                                       })
-                                   const { id } = await result.json();
-                                   return id;
-                               },
-                               onApprove: async ({ vaultSetupToken }) => {
-                                   const result = await fetch(
-                                       "[{oxgetseourl ident=$oViewConf->getGeneratePaymentTokenLink()}]"+vaultSetupToken,
-                                       {method: 'POST'
-                                       })
-                                   const status = await result.json();
+                createVaultSetupToken: async () => {
+                   const result = await fetch(
+                       "[{oxgetseourl ident=$oViewConf->getGenerateSetupTokenLink()}]",
+                       { method: "POST"
+                       })
+                   const { id } = await result.json();
+                   return id;
+                },
+                onApprove: async ({ vaultSetupToken }) => {
+                   const result = await fetch(
+                       "[{oxgetseourl ident=$oViewConf->getGeneratePaymentTokenLink()}]"+vaultSetupToken,
+                       {method: 'POST'
+                       })
+                   const status = await result.json();
 
-                                   if(status.state === "SUCCESS") {
-                                       showSuccessMessage();
-                                   }else {
-                                       showFailureMessage();
-                                   }
-                               },
-                               onError: (error) => {
-                                   //TODO
-                               },
-                               style: {
-                                   label: 'checkout'
-                               }
-                           }).render("#PayPalButtonVaulting");
+                   if(status.state === "SUCCESS") {
+                       showSuccessMessage();
+                   }else {
+                       showFailureMessage();
+                   }
+                },
+                onError: (error) => {
+                   //TODO
+                },
+                style: {
+                   label: 'checkout'
+                }
+            }).render("#PayPalButtonVaulting");
 
             function showSuccessMessage() {
                 $('#PayPalButtonVaulting').hide();
diff --git a/views/smarty/frontend/shared/page/checkout/acdc.tpl b/views/smarty/frontend/shared/page/checkout/acdc.tpl
index b348e6e5..cc5c931e 100644
--- a/views/smarty/frontend/shared/page/checkout/acdc.tpl
+++ b/views/smarty/frontend/shared/page/checkout/acdc.tpl
@@ -57,13 +57,13 @@
                     let downloadableProductAgreement = (document.getElementById('oxdownloadableproductsagreement') && document.getElementById('oxdownloadableproductsagreement').checked) ? 1 : 0;
                     let serviceProductAgreement = (document.getElementById('oxserviceproductsagreement') && document.getElementById('oxserviceproductsagreement').checked) ? 1 : 0;
                     let vaultPayment = document.getElementById("oscPayPalVaultPaymentCheckbox")?.checked ?? false;
-                    let url = '[{$sSelfLink}]' + "cl=order&fnc=createAcdcOrder&ord_agb="+
-                        ordAgb+"&oxdownloadableproductsagreement=" +downloadableProductAgreement
-                        + "&oxserviceproductsagreement="+serviceProductAgreement
-                        + "&stoken=" + '[{$oViewConf->getSessionChallengeToken()}]'
-                        + '&sDeliveryAddressMD5=' + '[{$oView->getDeliveryAddressMD5()}]'
-                        + '&vaultPayment=' + vaultPayment
-                        + '&oscPayPalPaymentTypeForVaulting=' + 'oscpaypal_acdc'
+                    let url = "[{$sSelfLink}]cl=order&fnc=createAcdcOrder&ord_agb=" + ordAgb
+                        + "&oxdownloadableproductsagreement=" + downloadableProductAgreement
+                        + "&oxserviceproductsagreement="+ serviceProductAgreement
+                        + "&stoken=" + "[{$oViewConf->getSessionChallengeToken()}]"
+                        + "&sDeliveryAddressMD5=" + "[{$oView->getDeliveryAddressMD5()}]"
+                        + "&vaultPayment=" + vaultPayment
+                        + "&oscPayPalPaymentTypeForVaulting=oscpaypal_acdc"
                     ;
                     return fetch(url, {
                         method: 'post',
diff --git a/views/twig/extensions/themes/default/page/account/dashboard.html.twig b/views/twig/extensions/themes/default/page/account/dashboard.html.twig
new file mode 100644
index 00000000..379ad9aa
--- /dev/null
+++ b/views/twig/extensions/themes/default/page/account/dashboard.html.twig
@@ -0,0 +1,32 @@
+{% extends "page/account/dashboard.html.twig" %}
+
+{% block account_dashboard_col1 %}
+    {{ parent() }}
+    {% if oViewConf.getIsVaultingActive() %}
+        {% if oViewConf.isVaultingAllowedForPayPal() %}
+            <div class="col mb-3">
+                <div class="card card-lg h-100">
+                    <h4 class="card-header card-title">{{ translate({ ident: "OSC_PAYPAL_VAULTING_MENU" }) }}</h4>
+                    <div class="card-body">
+                        <a class="btn btn-outline-primary stretched-link" href="{{ seo_url({ ident: oViewConf.getSelfLink() ~ "cl=oscaccountvault" }) }}">
+                            {{ translate({ ident: "MORE" }) }}
+                        </a>
+                    </div>
+                </div>
+            </div>
+        {% endif %}
+        {% if oViewConf.isAcdcEligibility() and oViewConf.isVaultingAllowedForACDC() %}
+            <div class="col mb-3">
+                <div class="card card-lg h-100">
+                    <h4 class="card-header card-title">{{ translate({ ident: "OSC_PAYPAL_VAULTING_MENU_CARD" }) }}</h4>
+                    <div class="card-body">
+                        <a class="btn btn-outline-primary stretched-link" href="{{ seo_url({ ident: oViewConf.getSelfLink() ~ "cl=oscaccountvaultcard" }) }}">
+                            {{ translate({ ident: "MORE" }) }}
+                        </a>
+                    </div>
+                </div>
+            </div>
+        {% endif %}
+    {% endif %}
+{% endblock %}
+
diff --git a/views/twig/extensions/themes/default/page/account/inc/account_menu.html.twig b/views/twig/extensions/themes/default/page/account/inc/account_menu.html.twig
new file mode 100644
index 00000000..4836145d
--- /dev/null
+++ b/views/twig/extensions/themes/default/page/account/inc/account_menu.html.twig
@@ -0,0 +1,13 @@
+{% extends "page/account/inc/account_menu.html.twig" %}
+
+{% block account_menu %}
+    {{ parent() }}
+    {% if oViewConf.getIsVaultingActive() %}
+        {% if oViewConf.isVaultingAllowedForPayPal() %}
+            <a class="dropdown-item{% if active_link == "oscPayPalVaulting" %} active{% endif %}" href="{{ seo_url({ ident: oViewConf.getSslSelfLink() ~ "cl=oscaccountvault" }) }}" title="{{ translate({ ident: "OSC_PAYPAL_VAULTING_MENU" }) }}">{{ translate({ ident: "OSC_PAYPAL_VAULTING_MENU" }) }}</a>
+        {% endif %}
+        {% if oViewConf.isAcdcEligibility() and oViewConf.isVaultingAllowedForACDC() %}
+            <a class="dropdown-item{% if active_link == "oscPayPalVaultingCard" %} active{% endif %}" href="{{ seo_url({ ident: oViewConf.getSslSelfLink() ~ "cl=oscaccountvaultcard" }) }}" title="{{ translate({ ident: "OSC_PAYPAL_VAULTING_MENU_CARD" }) }}">{{ translate({ ident: "OSC_PAYPAL_VAULTING_MENU_CARD" }) }}</a>
+        {% endif %}
+    {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/views/twig/extensions/themes/default/page/checkout/order.html.twig b/views/twig/extensions/themes/default/page/checkout/order.html.twig
index 211668a9..841233f1 100644
--- a/views/twig/extensions/themes/default/page/checkout/order.html.twig
+++ b/views/twig/extensions/themes/default/page/checkout/order.html.twig
@@ -2,7 +2,7 @@
 
 {% block shippingAndPayment %}
     {% set payment = oView.getPayment() %}
-    {% if payment.getId() == "oscpaypal_acdc" or payment.getId() == "oscpaypal_pui" %}
+    {% if payment.getId() in ['oscpaypal_acdc', 'oscpaypal_pui', 'oscpaypal'] or vaultedPaymentDescription %}
         {% set sPaymentID = payment.getId() %}
         <form action="{{ oViewConf.getSslSelfLink()|replace({'&amp;': '&'})|raw }}" method="post"
               id="orderShipping">
@@ -40,12 +40,16 @@
         </form>
         <div class="card-body">
             {% set payment = oView.getPayment() %}
-            {{ payment.oxpayments__oxdesc.value }}
-            {% if not oscpaypal_executing_order %}
+            {% if vaultedPaymentDescription %}
+                {{ vaultedPaymentDescription }}
+            {% elseif not oscpaypal_executing_order %}
+                {{ payment.oxpayments__oxdesc.value }}
                 {% if sPaymentID == "oscpaypal_acdc" %}
                     {% include "@osc_paypal/frontend/acdc.html.twig" %}
                 {% elseif sPaymentID == "oscpaypal_pui" %}
-                    {% include "@osc_paypal/frontend/pui_flow.html.twig" %}
+                    {% include "@osc_paypal/frontend/pui.html.twig" %}
+                {% elseif sPaymentID == "oscpaypal" %}
+                    {% include "@osc_paypal/frontend/paypal.html.twig" %}
                 {% endif %}
             {% endif %}
         </div>
diff --git a/views/twig/extensions/themes/default/page/checkout/thankyou.html.twig b/views/twig/extensions/themes/default/page/checkout/thankyou.html.twig
new file mode 100644
index 00000000..13587f00
--- /dev/null
+++ b/views/twig/extensions/themes/default/page/checkout/thankyou.html.twig
@@ -0,0 +1,19 @@
+{% extends "page/checkout/thankyou.html.twig" %}
+
+{% block checkout_thankyou_info %}
+    {{ parent() }}
+
+    {% set vaultSuccess = viewConf.getSessionVaultSuccess() %}
+
+    {% if vaultSuccess is not null %}
+        {% if vaultSuccess %}
+            <p class="alert alert-success">
+                {{ translate({ ident: "OSC_PAYPAL_VAULTING_SUCCESS" }) }}
+            </p>
+        {% else %}
+            <p class="alert alert-danger">
+                {{ translate({ ident: "OSC_PAYPAL_VAULTING_ERROR" }) }}
+            </p>
+        {% endif %}
+    {% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/views/twig/frontend/account_vaulting_card.html.twig b/views/twig/frontend/account_vaulting_card.html.twig
new file mode 100644
index 00000000..f5b94089
--- /dev/null
+++ b/views/twig/frontend/account_vaulting_card.html.twig
@@ -0,0 +1,106 @@
+{% capture append = "oxidBlock_content" %}
+    {% set template_title = "OSC_PAYPAL_VAULTING_MENU_CARD"|translate %}
+    <div class="container-xxl py-5">
+        <div class="row">
+            <h3 class="page-header col pl-0 ml-3">
+                {{ translate({ ident: "OSC_PAYPAL_VAULTING_MENU_CARD" }) }}
+            </h3>
+            <div class="col-12 col-sm-3 button-col">
+                {% include "page/account/inc/account_menu.html.twig" with {active_link: "oscPayPalVaultingCard"} %}
+            </div>
+        </div>
+        {% block account_vaulting_card %}
+            <div class="card card-lg">
+                <div class="card-header">
+                    <h3 class="card-title">{{ translate({ ident: "OSC_PAYPAL_VAULTING_SAVE_INSTRUCTION_CARD" }) }}</h3>
+                </div>
+                <div class="card-body">
+                    <p id="PayPalVaultingSuccess" class="alert alert-success" style="display: none">{{ translate({ ident: "OSC_PAYPAL_VAULTING_SUCCESS" }) }}</p>
+                    <p id="PayPalVaultingFailure" class="alert alert-danger" style="display: none">{{ translate({ ident: "OSC_PAYPAL_VAULTING_ERROR" }) }}</p>
+                    <div class='card_container' id="payPalVaultingCardContainer">
+                        <div id='card-holder-name'></div>
+                        <div id='card-number'></div>
+                        <div id='expiration-date'></div>
+                        <div id='cvv'></div>
+                        <button value='submit' id='submit' class="btn btn-primary">{{ translate({ ident: "OSC_PAYPAL_VAULTING_CARD_SAVE" }) }}</button>
+                    </div>
+                </div>
+                <script>
+                    window.onload = function () {
+                        const cardFields = paypal.CardFields({
+                            createVaultSetupToken: async () => {
+                                // Call your server API to generate a vaultSetupToken
+                                // and return it here as a string
+                                const result = await fetch(
+                                    "{{ seo_url({ ident: oViewConf.getGenerateSetupTokenLink(true) }) }}",
+                                    { method: "POST"
+                                    })
+                                const { id } = await result.json();
+                                return id;
+                            },
+                            onApprove: async (data) => {
+                                // Only for 3D Secure
+                                if(data.liabilityShift){
+                                    // Handle liability shift
+                                }
+
+                                const result = await fetch(
+                                    "{{ seo_url({ ident: oViewConf.getGeneratePaymentTokenLink() }) }}"+data.vaultSetupToken,
+                                    {
+                                        method: "POST",
+                                        body: JSON.stringify(data)
+                                    }
+                                );
+                                const status = await result.json();
+
+                                if(status.state !== "SUCCESS") {
+                                    //log error?
+                                }
+                            },
+                            onError: (error) =>
+                                console.error('Something went wrong:', error)
+                        })
+
+
+                        // Check eligibility and display advanced credit and debit card payments
+                        if (cardFields.isEligible()) {
+                            cardFields.NameField().render("#card-holder-name");
+                            cardFields.NumberField().render("#card-number");
+                            cardFields.ExpiryField().render("#expiration-date");
+                            cardFields.CVVField().render("#cvv");
+                        } else {
+                            // Handle the workflow when credit and debit cards are not available
+                        }
+
+                        const submitButton = document.getElementById("submit");
+                        submitButton.addEventListener("click", () => {
+                            cardFields
+                                .submit()
+                                .then(() => {
+                                    showSuccessMessage();
+                                })
+                                .catch((error) => {
+                                    showFailureMessage();
+                                });
+                        });
+
+                        function showSuccessMessage() {
+                            $('#payPalVaultingCardContainer').hide();
+                            $('#PayPalVaultingSuccess').show();
+                        }
+
+                        function showFailureMessage() {
+                            $('#PayPalVaultingFailure').show();
+                        }
+                    }
+                </script>
+                <div id="payments-sdk__contingency-lightbox"></div>
+            </div>
+
+            {% include "@osc_paypal/frontend/vaultedpaymentsources.html.twig" %}
+        {% endblock %}
+    </div>
+    {{ insert_tracker({title: template_title}) }}
+{% endcapture %}
+
+{% include "layout/page.html.twig" %}
\ No newline at end of file
diff --git a/views/twig/frontend/account_vaulting_paypal.html.twig b/views/twig/frontend/account_vaulting_paypal.html.twig
new file mode 100644
index 00000000..30aa1924
--- /dev/null
+++ b/views/twig/frontend/account_vaulting_paypal.html.twig
@@ -0,0 +1,74 @@
+{% capture append = "oxidBlock_content" %}
+    {% set template_title = "OSC_PAYPAL_VAULTING_MENU"|translate %}
+    <div class="container-xxl py-5">
+        <div class="row">
+            <h3 class="page-header col pl-0 ml-3">
+                {{ translate({ ident: "OSC_PAYPAL_VAULTING_MENU" }) }}
+            </h3>
+            <div class="col-12 col-sm-3 button-col">
+                {% include "page/account/inc/account_menu.html.twig" with {active_link: "oscPayPalVaulting"} %}
+            </div>
+        </div>
+        {% block account_vaulting_paypal %}
+            <div class="card card-lg">
+                <div class="card">
+                    <div class="card-header">
+                        <h3 class="card-title">{{ translate({ ident: "OSC_PAYPAL_VAULTING_SAVE_INSTRUCTION" }) }}</h3>
+                    </div>
+                    <div class="card-body">
+                        <p id="PayPalVaultingSuccess" class="alert alert-success" style="display: none">{{ translate({ ident: "OSC_PAYPAL_VAULTING_SUCCESS" }) }}</p>
+                        <p id="PayPalVaultingFailure" class="alert alert-danger" style="display: none">{{ translate({ ident: "OSC_PAYPAL_VAULTING_ERROR" }) }}</p>
+                        <div id="PayPalButtonVaulting" class="paypal-button-container paypal-button-wrapper large"></div>
+                    </div>
+                </div>
+                <script>
+                    window.onload = function () {
+                        paypal.Buttons({
+                            createVaultSetupToken: async () => {
+                               const result = await fetch(
+                                   "{{ seo_url({ ident: oViewConf.getGenerateSetupTokenLink() }) }}",
+                                   { method: "POST"
+                                   })
+                               const { id } = await result.json();
+                               return id;
+                            },
+                            onApprove: async ({ vaultSetupToken }) => {
+                               const result = await fetch(
+                                   "{{ seo_url({ ident: oViewConf.getGeneratePaymentTokenLink() }) }}"+vaultSetupToken,
+                                   {method: 'POST'
+                                   })
+                               const status = await result.json();
+
+                               if(status.state === "SUCCESS") {
+                                   showSuccessMessage();
+                               }else {
+                                   showFailureMessage();
+                               }
+                            },
+                            onError: (error) => {
+                               //TODO
+                            },
+                            style: {
+                               label: 'checkout'
+                            }
+                        }).render("#PayPalButtonVaulting");
+
+                        function showSuccessMessage() {
+                            $('#PayPalButtonVaulting').hide();
+                            $('#PayPalVaultingSuccess').show();
+                        }
+
+                        function showFailureMessage() {
+                            $('#PayPalVaultingFailure').show();
+                        }
+                    };
+                </script>
+
+                {% include "@osc_paypal/frontend/vaultedpaymentsources.html.twig" %}
+            </div>
+        {% endblock %}
+    </div>
+    {{ insert_tracker({title: template_title}) }}
+{% endcapture %}
+
+{% include "layout/page.html.twig" %}
\ No newline at end of file
diff --git a/views/twig/frontend/acdc.html.twig b/views/twig/frontend/acdc.html.twig
index 0a78f84d..4f143247 100644
--- a/views/twig/frontend/acdc.html.twig
+++ b/views/twig/frontend/acdc.html.twig
@@ -18,8 +18,8 @@
             <label for="card-holder-name">{{ translate({ ident: "OSC_PAYPAL_ACDC_CARD_NAME_ON_CARD" }) }}</label>
         </div>
         {% if oscpaypal_isVaultingPossible %}
-        <input type="checkbox" id="oscPayPalVaultPaymentCheckbox">
-        <label for="oscPayPalVaultPaymentCheckbox">{{ translate({ ident: "OSC_PAYPAL_VAULTING_SAVE" }) }}</label>
+            <input type="checkbox" id="oscPayPalVaultPaymentCheckbox">
+            <label for="oscPayPalVaultPaymentCheckbox">{{ translate({ ident: "OSC_PAYPAL_VAULTING_SAVE" }) }}</label>
         {% endif %}
         <div class="hidden">
             <input type="hidden" id="card-billing-address-street" name="card-billing-address-street" value="{% if oxcmp_user.oxuser__oxstreet.value %}{{ oxcmp_user.oxuser__oxstreet.value }}{% endif %} {% if oxcmp_user.oxuser__oxstreetnr.value %}{{ oxcmp_user.oxuser__oxstreetnr.value }}{% endif %}" />
@@ -54,14 +54,13 @@
                     let downloadableProductAgreement = (document.getElementById('oxdownloadableproductsagreement') && document.getElementById('oxdownloadableproductsagreement').checked) ? 1 : 0;
                     let serviceProductAgreement = (document.getElementById('oxserviceproductsagreement') && document.getElementById('oxserviceproductsagreement').checked) ? 1 : 0;
                     let vaultPayment = document.getElementById("oscPayPalVaultPaymentCheckbox")?.checked ?? false;
-                    let url = '{{ sSelfLink|raw }}' +
-                                "cl=order&fnc=createAcdcOrder&ord_agb=" + ordAgb +
-                                "&oxdownloadableproductsagreement=" + downloadableProductAgreement +
-                                "&oxserviceproductsagreement=" + serviceProductAgreement +
-                                "&stoken=" + '{{ oViewConf.getSessionChallengeToken() }}' +
-                                "&sDeliveryAddressMD5=" + '{{ oView.getDeliveryAddressMD5() }}' +
-                                '&vaultPayment=' + vaultPayment +
-                                '&oscPayPalPaymentTypeForVaulting=' + 'oscpaypal_acdc'
+                    let url = "{{ sSelfLink }}cl=order&fnc=createAcdcOrder&ord_agb=" + ordAgb
+                        + "&oxdownloadableproductsagreement=" + downloadableProductAgreement
+                        + "&oxserviceproductsagreement="+ serviceProductAgreement
+                        + "&stoken=" + "{{ oViewConf.getSessionChallengeToken() }}"
+                        + "&sDeliveryAddressMD5=" + "{{ oView.getDeliveryAddressMD5() }}"
+                        + "&vaultPayment=" + vaultPayment
+                        + "&oscPayPalPaymentTypeForVaulting=oscpaypal_acdc"
                     ;
                     return fetch(url, {
                         method: 'post',
diff --git a/views/twig/frontend/paypal.html.twig b/views/twig/frontend/paypal.html.twig
new file mode 100644
index 00000000..16b13c4b
--- /dev/null
+++ b/views/twig/frontend/paypal.html.twig
@@ -0,0 +1,6 @@
+{% if oscpaypal_isVaultingPossible %}
+    <br />
+    <br />
+    <input type="checkbox" id="oscPayPalVaultPaymentCheckbox">
+    <label for="oscPayPalVaultPaymentCheckbox">{{ translate({ ident: "OSC_PAYPAL_VAULTING_SAVE" }) }}</label>
+{% endif %}
\ No newline at end of file
diff --git a/views/twig/frontend/pui_flow.html.twig b/views/twig/frontend/pui.html.twig
similarity index 100%
rename from views/twig/frontend/pui_flow.html.twig
rename to views/twig/frontend/pui.html.twig
diff --git a/views/twig/frontend/vaultedpaymentsources.html.twig b/views/twig/frontend/vaultedpaymentsources.html.twig
new file mode 100644
index 00000000..83a55b53
--- /dev/null
+++ b/views/twig/frontend/vaultedpaymentsources.html.twig
@@ -0,0 +1,38 @@
+{% set vaultedPaymentSources = oViewConf.getVaultPaymentTokens() %}
+
+{% if vaultedPaymentSources %}
+    <div class="card">
+        <div class="card-header">
+            <h3 id="paymentHeader" class="card-title">{{ translate({ ident: "OSC_PAYPAL_VAULTING_VAULTED_PAYMENTS" }) }}</h3>
+        </div>
+        <div class="card-body">
+            <ul>
+                {% for paymentToken in vaultedPaymentSources %}
+                    <li class="mt-3">
+                        <form action="{{ oViewConf.getSslSelfLink()|replace("&amp;", "&") }}" method="post">
+                            <div class="hidden">
+                                {{ oViewConf.getHiddenSid() }}
+                                <input type="hidden" name="cl" value="{{ oViewConf.getActiveClassName() }}">
+                                <input type="hidden" name="fnc" value="deleteVaultedPayment">
+                                <input type="hidden" name="paymentTokenId" value="{{ paymentToken.id }}">
+                            </div>
+
+                            {% if paymentToken.payment_source.card %}
+                                {% set brand = paymentToken.payment_source.card.brand %}
+                                {% set lastdigits = paymentToken.payment_source.card.last_digits %}
+                                {{ brand }} {{ translate({ ident: "OSC_PAYPAL_CARD_ENDING_IN" }) }}{{ lastdigits }}
+                            {% elseif paymentToken.payment_source.paypal %}
+                                {% set lastdigits = paymentToken.payment_source.paypal.email_address %}
+                                {{ translate({ ident: "OSC_PAYPAL_CARD_PAYPAL_PAYMENT" }) }} {{ lastdigits }}
+                            {% endif %}
+
+                            <button type="submit" class="btn btn-outline-danger btn-sm">
+                                {{ translate({ ident: "OSC_PAYPAL_VAULTING_DELETE" }) }}
+                            </button>
+                        </form>
+                    </li>
+                {% endfor %}
+            </ul>
+        </div>
+    </div>
+{% endif %}