diff --git a/modules/bnporc/pp/pages.py b/modules/bnporc/pp/pages.py
index 0ca79a8fba504792d5bd68c1ed17dc02eb5907e1..2624b02fc4a7d3adc656207ac8ae98cbc0531efb 100644
--- a/modules/bnporc/pp/pages.py
+++ b/modules/bnporc/pp/pages.py
@@ -205,15 +205,16 @@ def on_load(self):
             if not msg:
                 msg = self.get('message')
 
-            wrongpass_codes = [201, 21510, 203, 202, 1001, 7]
+            wrongpass_codes = [201, 21510, 203, 202, 7]
             actionNeeded_codes = [21501, 3, 4, 50]
+            websiteUnavailable_codes = [207, 1001]
             if error in wrongpass_codes:
                 raise BrowserIncorrectPassword(msg)
             elif error == 21: # "Ce service est momentanément indisponible. Veuillez renouveler votre demande ultérieurement." -> In reality, account is blocked because of too much wrongpass
                 raise ActionNeeded(u"Compte bloqué")
             elif error in actionNeeded_codes:
                 raise ActionNeeded(msg)
-            elif error == 207:
+            elif error in websiteUnavailable_codes:
                 raise BrowserUnavailable(msg)
             else:
                 assert False, 'Unexpected error at login: "%s" (code=%s)' % (msg, error)