diff --git a/modules/amazon/browser.py b/modules/amazon/browser.py
index b2b59de1b9f1039b7d4eb6b873e893c7f0843ee3..8cd3482fb9c3c8b814a13e8954c9a0c6765a8ef8 100644
--- a/modules/amazon/browser.py
+++ b/modules/amazon/browser.py
@@ -133,7 +133,7 @@ def do_login(self):
             if not has_captcha:
                 raise BrowserIncorrectPassword()
             else:
-                raise CaptchaQuestion(image_url=has_captcha, type="image_captcha")
+                raise CaptchaQuestion('image_captcha', image_url=has_captcha)
 
     def location(self, *args, **kwargs):
         """
diff --git a/modules/edf/par/browser.py b/modules/edf/par/browser.py
index 3f32642e2ae7d04b7b595901568be645c6589224..3a67a6b9eb2a0e7f80160499ca432e65ec16f390 100644
--- a/modules/edf/par/browser.py
+++ b/modules/edf/par/browser.py
@@ -67,7 +67,7 @@ def do_login(self):
             if self.page.has_captcha_request():
                 website_key = self.page.get_recaptcha_key()  # google recaptcha plubic key
                 website_url = "https://particulier.edf.fr/fr/accueil.html"
-                raise CaptchaQuestion(website_key=website_key, website_url=website_url, type="g_recaptcha")
+                raise CaptchaQuestion('g_recaptcha', website_key=website_key, website_url=website_url)
             else:
                 raise BrowserIncorrectPassword()
         else:
diff --git a/weboob/exceptions.py b/weboob/exceptions.py
index 199d7915ce3c1cdcc218fbc901976e865122a2f9..d88ec18b408405b8f3c0a5159d863a447ecb4ef9 100644
--- a/weboob/exceptions.py
+++ b/weboob/exceptions.py
@@ -46,12 +46,11 @@ class CaptchaQuestion(Exception):
     """
     Handles captcha
     """
-    def __init__(self, website_key=None, website_url=None, image_url=None, type=None):
+    def __init__(self, type=None, **kwargs):
         super(CaptchaQuestion, self).__init__("The site requires solving a captcha")
-        self.website_key = website_key
-        self.website_url = website_url
         self.type = type
-        self.image_url = image_url
+        for key, value in kwargs.items():
+            setattr(self, key, value)
 
 
 class BrowserHTTPNotFound(BrowserUnavailable):