diff --git a/modules/banquepopulaire/browser.py b/modules/banquepopulaire/browser.py
index 10209254..807ada61 100644
--- a/modules/banquepopulaire/browser.py
+++ b/modules/banquepopulaire/browser.py
@@ -125,8 +125,7 @@ class BanquePopulaire(BaseBrowser):
         return None
 
     def get_history(self, account, coming=False):
-        if not self.is_on_page(AccountsPage):
-            account = self.get_account(account.id)
+        account = self.get_account(account.id)
 
         if coming:
             params = account._coming_params
diff --git a/modules/banquepopulaire/pages.py b/modules/banquepopulaire/pages.py
index 184bd3a5..08a25672 100644
--- a/modules/banquepopulaire/pages.py
+++ b/modules/banquepopulaire/pages.py
@@ -284,7 +284,7 @@ class AccountsPage(BasePage):
                 account._next_debit = None
                 account._params = None
                 account._coming_params = None
-                if balance != u'':
+                if balance != u'' and len(tds[3].xpath('.//a')) > 0:
                     account._params = params.copy()
                     account._params['dialogActionPerformed'] = 'SOLDE'
                     account._params['attribute($SEL_$%s)' % tr.attrib['id'].split('_')[0]] = tr.attrib['id'].split('_', 1)[1]