diff --git a/addons/account/wizard/setup_wizards.py b/addons/account/wizard/setup_wizards.py
index 5b890306e98..2fde6629520 100644
--- a/addons/account/wizard/setup_wizards.py
+++ b/addons/account/wizard/setup_wizards.py
@@ -94,6 +94,12 @@ class SetupBarBankConfigWizard(models.TransientModel):
         """
         vals['partner_id'] = self.env.company.partner_id.id
         vals['new_journal_name'] = vals['acc_number']
+
+        # If no bank has been selected, but we have a bic, we are using it to find or create the bank
+        if not vals['bank_id'] and vals['bank_bic']:
+            vals['bank_id'] = self.env['res.bank'].search([('bic', '=', vals['bank_bic'])], limit=1).id \
+                              or self.env['res.bank'].create({'name': vals['bank_bic'], 'bic': vals['bank_bic']}).id
+
         return super(SetupBarBankConfigWizard, self).create(vals)
 
     @api.onchange('linked_journal_id')
diff --git a/addons/account/wizard/setup_wizards_view.xml b/addons/account/wizard/setup_wizards_view.xml
index c5c94d3c440..52f0e5ff1b3 100644
--- a/addons/account/wizard/setup_wizards_view.xml
+++ b/addons/account/wizard/setup_wizards_view.xml
@@ -44,8 +44,8 @@
                         <group>
                             <group>
                                 <field name="acc_number" placeholder="e.g BE15001559627230"/>
-                                <field name="bank_id" placeholder="e.g Bank of America"/>
                                 <field name="bank_bic" placeholder="e.g GEBABEBB" string="Bank Identifier Code"/>
+                                <field name="bank_id" placeholder="e.g Bank of America"/>
                             </group>
                         </group>
                         <group attrs="{'invisible': [('num_journals_without_account', '&lt;', 2)]}">