diff --git a/account_ebics/__manifest__.py b/account_ebics/__manifest__.py
index a4e0c43..1069c9b 100644
--- a/account_ebics/__manifest__.py
+++ b/account_ebics/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "EBICS banking protocol",
-    "version": "15.0.1.2.0",
+    "version": "15.0.1.2.1",
     "license": "LGPL-3",
     "author": "Noviat",
     "website": "https://www.noviat.com/",
diff --git a/account_ebics/wizards/ebics_xfer.py b/account_ebics/wizards/ebics_xfer.py
index 05fb3ba..08be0e3 100644
--- a/account_ebics/wizards/ebics_xfer.py
+++ b/account_ebics/wizards/ebics_xfer.py
@@ -115,7 +115,8 @@ class EbicsXfer(models.TransientModel):
     @api.onchange("ebics_config_id")
     def _onchange_ebics_config_id(self):
         ebics_userids = self.ebics_config_id.ebics_userid_ids
-        if self._context.get("ebics_download"):
+        ctx = self.env.context
+        if ctx.get("ebics_download"):
             download_formats = self.ebics_config_id.ebics_file_format_ids.filtered(
                 lambda r: r.type == "down"
             )
@@ -130,16 +131,19 @@ class EbicsXfer(models.TransientModel):
                 if len(transport_users) == 1:
                     self.ebics_userid_id = transport_users
         else:
-            upload_formats = self.ebics_config_id.ebics_file_format_ids.filtered(
-                lambda r: r.type == "up"
-            )
-            if len(upload_formats) == 1:
-                self.format_id = upload_formats
             if len(ebics_userids) == 1:
                 self.ebics_userid_id = ebics_userids
+            if not ctx.get("active_model") == "account.payment.order":
+                upload_formats = self.ebics_config_id.ebics_file_format_ids.filtered(
+                    lambda r: r.type == "up"
+                )
+                if len(upload_formats) == 1:
+                    self.format_id = upload_formats
 
     @api.onchange("upload_data")
     def _onchange_upload_data(self):
+        if self.env.context.get("active_model") == "account.payment.order":
+            return
         self.upload_fname_dummy = self.upload_fname
         self.format_id = False
         self._detect_upload_format()
@@ -157,10 +161,6 @@ class EbicsXfer(models.TransientModel):
             if len(upload_formats) == 1:
                 self.format_id = upload_formats
 
-    @api.onchange("format_id")
-    def _onchange_format_id(self):
-        self.order_type = self.format_id.order_type
-
     def ebics_upload(self):
         self.ensure_one()
         ctx = self._context.copy()
diff --git a/account_ebics/wizards/ebics_xfer.xml b/account_ebics/wizards/ebics_xfer.xml
index 5d319e2..3e604b0 100644
--- a/account_ebics/wizards/ebics_xfer.xml
+++ b/account_ebics/wizards/ebics_xfer.xml
@@ -69,8 +69,8 @@
           <field name="upload_format_ids" invisible="1" />
           <field
                         name="format_id"
-                        domain="[('id', 'in', upload_format_ids)]"
                         required="1"
+                        domain="[('type', '=', 'up'), ('id', 'in', allowed_format_ids)]"
                         readonly="context.get('active_model') == 'account.payment.order'"
                     />
           <field name="order_type" />
diff --git a/account_ebics_payment_order/__manifest__.py b/account_ebics_payment_order/__manifest__.py
index fec9769..e01312a 100644
--- a/account_ebics_payment_order/__manifest__.py
+++ b/account_ebics_payment_order/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Upload Payment Order via EBICS",
-    "version": "15.0.1.1.0",
+    "version": "15.0.1.1.1",
     "license": "LGPL-3",
     "author": "Noviat",
     "website": "https://www.noviat.com/",
diff --git a/account_ebics_payment_order/models/account_payment_order.py b/account_ebics_payment_order/models/account_payment_order.py
index 9b45185..7a04ad0 100644
--- a/account_ebics_payment_order/models/account_payment_order.py
+++ b/account_ebics_payment_order/models/account_payment_order.py
@@ -70,7 +70,6 @@ class AccountPaymentOrder(models.Model):
             ebics_xfer = self.env["ebics.xfer"].with_context(**ctx).create({})
             ebics_xfer._onchange_ebics_config_id()
             ebics_xfer._onchange_upload_data()
-            ebics_xfer._onchange_format_id()
             view = self.env.ref("account_ebics.ebics_xfer_view_form_upload")
             act = {
                 "name": _("EBICS Upload"),
diff --git a/account_ebics_payment_order/views/account_payment_mode.xml b/account_ebics_payment_order/views/account_payment_mode.xml
new file mode 100644
index 0000000..76d66e5
--- /dev/null
+++ b/account_ebics_payment_order/views/account_payment_mode.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="account_payment_mode_form" model="ir.ui.view">
+        <field name="name">account.payment.mode.form</field>
+        <field name="model">account.payment.mode</field>
+        <field name="inherit_id" ref="account_payment_mode.account_payment_mode_form" />
+        <field name="arch" type="xml">
+            <field name="payment_type" position="after">
+                <field
+                    name="ebics_format_id"
+                    attrs="{'invisible': [('payment_order_ok', '=', False)]}"
+                />
+            </field>
+        </field>
+    </record>
+
+</odoo>