diff --git a/account_ebics/__manifest__.py b/account_ebics/__manifest__.py
index eba4c4c..6e0383b 100644
--- a/account_ebics/__manifest__.py
+++ b/account_ebics/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "EBICS banking protocol",
-    "version": "16.0.1.9.0",
+    "version": "16.0.1.9.1",
     "license": "LGPL-3",
     "author": "Noviat",
     "website": "https://www.noviat.com/",
diff --git a/account_ebics/models/ebics_userid.py b/account_ebics/models/ebics_userid.py
index 5ec018c..335c62a 100644
--- a/account_ebics/models/ebics_userid.py
+++ b/account_ebics/models/ebics_userid.py
@@ -228,7 +228,7 @@ class EbicsUserID(models.Model):
                 rec.ebics_keys_fn
             )
 
-    @api.depends("state", "ebics_passphrase")
+    @api.depends("state", "ebics_passphrase", "ebics_keys_found")
     def _compute_ebics_passphrase_view_modifiers(self):
         for rec in self:
             rec.ebics_passphrase_required = False
@@ -236,6 +236,7 @@ class EbicsUserID(models.Model):
             rec.ebics_passphrase_store_readonly = True
             if rec.state == "draft":
                 rec.ebics_passphrase_required = True
+                rec.ebics_passphrase_invisible = rec.ebics_keys_found and True or False
                 rec.ebics_passphrase_store_readonly = False
             elif rec.state == "init":
                 rec.ebics_passphrase_required = False
diff --git a/account_ebics/views/ebics_userid_views.xml b/account_ebics/views/ebics_userid_views.xml
index 10842f2..cf6c874 100644
--- a/account_ebics/views/ebics_userid_views.xml
+++ b/account_ebics/views/ebics_userid_views.xml
@@ -83,6 +83,7 @@
           <field name="state" widget="statusbar" />
         </header>
         <group name="invisible" invisible="1">
+          <field name="ebics_config_id" />
           <field name="ebics_keys_found" />
           <field name="ebics_keys_fn" />
           <field name="ebics_version" />