diff --git a/account_bank_statement_import_usability/__openerp__.py b/account_bank_statement_import_usability/__openerp__.py
index c37e7e3..1e3fb97 100644
--- a/account_bank_statement_import_usability/__openerp__.py
+++ b/account_bank_statement_import_usability/__openerp__.py
@@ -31,7 +31,13 @@
 Account Bank Statement Import Usability
 =======================================
 
-Blocks the *Automagically create bank account*, because it's too dangerous : it creates new bank accounts and new account journal... and the user doesn't even realize that !
+This module adds the following changes:
+
+* Blocks the *Automagically create bank account*, because it's too dangerous : it creates new bank accounts and new account journal... and the user doesn't even realize that !
+
+* Works if the bank statement file only contain the account number and not the full IBAN
+
+* If you have 2 accounts with the same number (I know a company that has an account in EUR and an account in USD with the same number), you should force the journal and it will work (instead of blocking with an error message)
 
 This module has been written by Alexis de Lattre from Akretion <alexis.delattre@akretion.com>.
     """,
diff --git a/account_bank_statement_import_usability/account_bank_statement_import.py b/account_bank_statement_import_usability/account_bank_statement_import.py
index 37bf73c..da96fa9 100644
--- a/account_bank_statement_import_usability/account_bank_statement_import.py
+++ b/account_bank_statement_import_usability/account_bank_statement_import.py
@@ -20,8 +20,7 @@
 #
 ##############################################################################
 
-from openerp import models, api, _
-from openerp.exceptions import Warning as UserError
+from openerp import models, api
 
 
 class AccountBankStatementImport(models.TransientModel):
@@ -30,10 +29,32 @@ class AccountBankStatementImport(models.TransientModel):
 
     @api.model
     def _find_bank_account_id(self, account_number):
-        """ Get res.partner.bank ID """
+        """Compared to the code in the module account_bank_statement_import,
+        this code:
+        - works when the account_number is not a complete IBAN,
+          but just an account number (most statement files only have the
+          account number)
+        - works if you have 2 bank accounts with the same number
+          (I have seen that at Crédit du Nord: the company had 1 account in USD
+          and 1 account in EUR with the same number !)
+          -> for that, I filter on the journal if the journal_id field is set
+          """
         bank_account_id = None
         if account_number and len(account_number) > 4:
-            self._cr.execute("select id from res_partner_bank where replace(replace(acc_number,' ',''),'-','') like %s and journal_id is not null", ('%' + account_number + '%',))
+            if self.journal_id:
+                self._cr.execute("""
+                    SELECT id FROM res_partner_bank
+                    WHERE replace(replace(acc_number,' ',''),'-','') like %s
+                    AND journal_id=%s
+                    ORDER BY id
+                    """, ('%' + account_number + '%', self.journal_id.id))
+            else:
+                self._cr.execute("""
+                    SELECT id FROM res_partner_bank
+                    WHERE replace(replace(acc_number,' ',''),'-','') like %s
+                    AND journal_id is not null
+                    ORDER BY id
+                    """, ('%' + account_number + '%', ))
             bank_account_ids = [id[0] for id in self._cr.fetchall()]
             if bank_account_ids:
                 bank_account_id = bank_account_ids[0]