diff --git a/src/Resources/app/storefront/src/scss/checkout/payment-selection.scss b/src/Resources/app/storefront/src/scss/checkout/payment-selection.scss
index 6536b54ca..e9000d92f 100644
--- a/src/Resources/app/storefront/src/scss/checkout/payment-selection.scss
+++ b/src/Resources/app/storefront/src/scss/checkout/payment-selection.scss
@@ -9,6 +9,10 @@
         margin-top: 15px;
     }
 
+    .mollie-bancomat-pay{
+        margin-top:15px;
+    }
+
     .mollie-pos-terminals {
         margin-top: 15px;
     }
@@ -27,6 +31,10 @@
         }
     }
 
+    .mollie-bancomat-pay{
+        margin-top:15px;
+    }
+
     .mollie-pos-terminals {
         margin-top: 15px;
 
diff --git a/src/Resources/snippet/de_DE/mollie-payments.de-DE.json b/src/Resources/snippet/de_DE/mollie-payments.de-DE.json
index 4d6de8a76..a25f8be5d 100644
--- a/src/Resources/snippet/de_DE/mollie-payments.de-DE.json
+++ b/src/Resources/snippet/de_DE/mollie-payments.de-DE.json
@@ -46,7 +46,7 @@
             },
             "bancomatPay": {
               "headLine": "Telefonnummer",
-              "phoneErrorMessage": "Die Telefonnummer ist im E.164-Format erforderlich. Zum Beispiel +31208202070"
+              "phoneErrorMessage": "Die Telefonnummer ist erforderlich. Zum Beispiel +31208202070"
             }
         },
         "messages": {
diff --git a/src/Resources/snippet/en_GB/mollie-payments.en-GB.json b/src/Resources/snippet/en_GB/mollie-payments.en-GB.json
index 5ae2c1ebe..c90c86622 100644
--- a/src/Resources/snippet/en_GB/mollie-payments.en-GB.json
+++ b/src/Resources/snippet/en_GB/mollie-payments.en-GB.json
@@ -46,7 +46,7 @@
             },
             "bancomatPay": {
               "headLine": "Phone number",
-              "phoneErrorMessage": "Phone Number is required in the E.164 format. For example +31208202070"
+              "phoneErrorMessage": "Phone Number is required. For example +31208202070"
             }
         },
         "messages": {
diff --git a/src/Resources/snippet/nl_NL/mollie-payments.nl-NL.json b/src/Resources/snippet/nl_NL/mollie-payments.nl-NL.json
index 5fb8644b5..e73d3d682 100644
--- a/src/Resources/snippet/nl_NL/mollie-payments.nl-NL.json
+++ b/src/Resources/snippet/nl_NL/mollie-payments.nl-NL.json
@@ -46,7 +46,7 @@
             },
             "bancomatPay": {
               "headLine": "Telefoonnummer",
-              "phoneErrorMessage": "Telefoonnummer is vereist in het E.164-formaat. Bijvoorbeeld +31208202070"
+              "phoneErrorMessage": "Telefoonnummer is vereist. Bijvoorbeeld +31208202070"
             }
         },
         "messages": {
diff --git a/src/Resources/views/storefront/base.html.twig b/src/Resources/views/storefront/base.html.twig
index c266d66d7..aee39e3d5 100644
--- a/src/Resources/views/storefront/base.html.twig
+++ b/src/Resources/views/storefront/base.html.twig
@@ -17,7 +17,7 @@
     {% set includeJsInHeader = false %}
 
     {# js always required on this pages #}
-    {% if currentRoute == 'frontend.checkout.cart.page' or currentRoute == 'frontend.checkout.confirm.page' %}
+    {% if currentRoute == 'frontend.checkout.cart.page' or currentRoute == 'frontend.checkout.confirm.page'  or currentRoute == 'frontend.account.edit-order.page' %}
         {% set includeJsInHeader = true %}
     {% endif %}
 
diff --git a/src/Resources/views/storefront/component/payment/component/bancomat-fields.html.twig b/src/Resources/views/storefront/component/payment/component/bancomat-fields.html.twig
index cfeb79124..634bdfcc6 100644
--- a/src/Resources/views/storefront/component/payment/component/bancomat-fields.html.twig
+++ b/src/Resources/views/storefront/component/payment/component/bancomat-fields.html.twig
@@ -2,13 +2,12 @@
     <div class="mollie-bancomat-pay">
 
         <label for="mollieBancomatPayPhone">{{ "molliePayments.components.bancomatPay.headLine"|trans|striptags }}:*</label>
-
         <input id="mollieBancomatPayPhone"
                placeholder="+49123456789"
                name="mollieBancomatPayPhone" form="confirmOrderForm" type="text" pattern="\+[1-9]\d{1,14}"
                class="form-control"
-               value="{{ page.order.customFields.mollie_payments.bancomatPayPhoneNumber }}"
-               required="required" {% if page.order.customFields.mollie_payments.bancomatPayPhoneNumber !== null %}readonly="readonly" disabled="disabled"{% endif %} />
+               value="{{ context.customer.activeBillingAddress.phoneNumber }}"
+               required="required" />
         <small class="form-text js-validation-message invalid-feedback d-none"
                data-form-validation-invalid-phone="true" invalid="true">
             {{ "molliePayments.components.bancomatPay.phoneErrorMessage"|trans|striptags }}
diff --git a/tests/Cypress/cypress/e2e/storefront/payment-methods/bancomat.cy.js b/tests/Cypress/cypress/e2e/storefront/payment-methods/bancomat.cy.js
index 068e7f101..33f0b75d3 100644
--- a/tests/Cypress/cypress/e2e/storefront/payment-methods/bancomat.cy.js
+++ b/tests/Cypress/cypress/e2e/storefront/payment-methods/bancomat.cy.js
@@ -33,8 +33,6 @@ describe('Bancomat Pay', () => {
             scenarioDummyBasket.execute();
 
             paymentAction.switchPaymentMethod('Bancomat Pay');
-
-            // payment would only work using currency CHF which cannot be done at the moment
         })
 
     })