diff --git a/modules/edf/par/browser.py b/modules/edf/par/browser.py
index 1733735fd0664cc58a757df3f32b96775e82726a..f2c18e02855e4c4289fa4c99e8c294579d301204 100644
--- a/modules/edf/par/browser.py
+++ b/modules/edf/par/browser.py
@@ -92,10 +92,8 @@ def do_login(self):
             """
             self.check_authenticate.go()
         else:
-            self.home.go()
+            self.authenticate.go(method='POST', params=auth_params)
             if self.page.has_captcha_request():
-                # google recaptcha site key is returned here, but it's not a good one, take it from another url
-                self.authenticate.go(method='POST', params=auth_params)
                 data = self.page.get_data()
                 website_key = data['callbacks'][4]['output'][0]['value']
                 website_url = "https://espace-client.edf.fr/sso/XUI/#login/&realm=%2FINTERNET"
diff --git a/modules/edf/par/pages.py b/modules/edf/par/pages.py
index 0a28a1d2c4add30bd2a2213c6940c7270e8022db..0565e3749f14d034264b7689f768b8b0ecb07589 100644
--- a/modules/edf/par/pages.py
+++ b/modules/edf/par/pages.py
@@ -33,11 +33,13 @@
 
 
 class HomePage(HTMLPage):
-    def has_captcha_request(self):
-        return len(self.doc.xpath('//div[@class="captcha"]')) > 0
+    pass
 
 
 class AuthenticatePage(JsonPage):
+    def has_captcha_request(self):
+        return self.doc['stage'] == "RecaptchaModuleS1"
+
     def get_data(self):
         return self.doc