diff --git a/modules/creditdunord/browser.py b/modules/creditdunord/browser.py
index 5d8d941c367db2aac0baace83d294a7e9556f4e8..da20f469c4c2af3c9325dce890c1edb8fc75880c 100644
--- a/modules/creditdunord/browser.py
+++ b/modules/creditdunord/browser.py
@@ -83,9 +83,18 @@ def do_login(self):
         if not self.logged:
             raise BrowserIncorrectPassword()
 
+        # The redirection page may contain a message
         if self.page.doc.xpath('//head[title="Authentification"]/script[contains(text(), "_pageLabel=reinitialisation_mot_de_passe")]'):
             raise BrowserPasswordExpired()
 
+        if not self.entrypage.is_here():
+            self.entrypage.go()
+
+        # The main page may contain a message as well
+        msg = 'vous devez modifier votre code confidentiel à la première connexion puis tous les 12 mois'
+        if self.page.doc.xpath('//b[contains(text(), "%s")]' % msg):
+            raise BrowserPasswordExpired(msg.capitalize())
+
     def _iter_accounts(self):
         self.loans.go(account_type=self.account_type, loans_page_label=self.loans_page_label)
         for a in self.page.get_list():