diff --git a/weboob/backends/ehentai/backend.py b/weboob/backends/ehentai/backend.py
index ed9b8d86..5cb0b95e 100644
--- a/weboob/backends/ehentai/backend.py
+++ b/weboob/backends/ehentai/backend.py
@@ -40,8 +40,8 @@ class EHentaiBackend(BaseBackend, ICapGallery):
     BROWSER = EHentaiBrowser
     CONFIG = ValuesDict(
         Value('domain', label='Domain', default='g.e-hentai.org'),
-        Value('username', label='Username', default=None),
-        Value('password', label='Password', default=None, masked=True))
+        Value('username', label='Username', default=''),
+        Value('password', label='Password', default='', masked=True))
 
     def create_default_browser(self):
         return self.create_browser(
diff --git a/weboob/backends/ehentai/browser.py b/weboob/backends/ehentai/browser.py
index aeb44a65..a8c206ae 100644
--- a/weboob/backends/ehentai/browser.py
+++ b/weboob/backends/ehentai/browser.py
@@ -42,7 +42,7 @@ class EHentaiBrowser(BaseBrowser):
         self.DOMAIN = domain
         self.logged = False
         BaseBrowser.__init__(self, *args, **kwargs)
-        if password is not None:
+        if password:
             self.login(username, password)
 
     def _gallery_page(self, gallery, n):