diff --git a/modules/fortuneo/browser.py b/modules/fortuneo/browser.py
index 016cf240..40727159 100644
--- a/modules/fortuneo/browser.py
+++ b/modules/fortuneo/browser.py
@@ -33,18 +33,14 @@ class Fortuneo(BaseBrowser):
     CERTHASH = 'f71bd27994f395963c4a500d9d330cb50cef37ee5946146f9ca2492c2552b2ba'
     ENCODING = None # refer to the HTML encoding
     PAGES = {
-            '.*identification.jsp.*':
-                    LoginPage,
-            '.*/prive/mes-comptes/synthese-tous-comptes.jsp':
-                AccountsList,
-            '.*/prive/mes-comptes/synthese-mes-comptes\.jsp':
-                    AccountsList,
-            '.*/prive/mes-comptes/livret/consulter-situation/consulter-solde\.jsp\?COMPTE_ACTIF=.*':
-                    AccountHistoryPage,
-            '.*/prive/mes-comptes/compte-courant/consulter-situation/consulter-solde\.jsp\?COMPTE_ACTIF=.*':
-                    AccountHistoryPage,
-            '.*/prive/default\.jsp.*':
-                   AccountsList
+            '.*identification\.jsp.*' :                                                                         LoginPage,
+
+            '.*prive/default\.jsp.*' :                                                                           AccountsList,
+            '.*/prive/mes-comptes/synthese-mes-comptes\.jsp' :                                                  AccountsList,
+
+            '.*/prive/mes-comptes/livret/consulter-situation/consulter-solde\.jsp.*' :                          AccountHistoryPage,
+            '.*/prive/mes-comptes/compte-courant/consulter-situation/consulter-solde\.jsp.*' :                  AccountHistoryPage,
+
             }
 
     def __init__(self, *args, **kwargs):
diff --git a/modules/fortuneo/pages/accounts_list.py b/modules/fortuneo/pages/accounts_list.py
index e61a8d5c..c2fae6d8 100644
--- a/modules/fortuneo/pages/accounts_list.py
+++ b/modules/fortuneo/pages/accounts_list.py
@@ -106,11 +106,15 @@ class AccountsList(BasePage):
             #else:
             #    account.coming = Decimal(mycomingval)
 
-            # account._link_id
             url_to_parse = cpt.xpath('@href')[0].replace("\n", "")  # link
-            compte_id_re = re.compile(r'/prive/mes-comptes/([^/]+/).*COMPTE_ACTIF=([^\&]+)\&?')
-            account._link_id = '/fr/prive/mes-comptes/%sconsulter-situation/consulter-solde.jsp?COMPTE_ACTIF=%s' % \
-                    (compte_id_re.search(url_to_parse).groups()[0], compte_id_re.search(url_to_parse).groups()[1])
+
+            # account._link_id = lien vers historique d'un compte (courant of livret)
+            if '/mes-comptes/livret/' in url_to_parse:
+                compte_id_re = re.compile(r'.*\?(.*)$')
+                account._link_id = '/fr/prive/mes-comptes/livret/consulter-situation/consulter-solde.jsp?%s' % \
+                    (compte_id_re.search(url_to_parse).groups()[0])
+            else:
+                account._link_id = url_to_parse
 
             # account.label
             temp_label = cpt.xpath('./text()')[1].replace(u'-\xa0', '').replace("\n", "").replace("\t", "")