diff --git a/weboob/tools/browser/decorators.py b/weboob/tools/browser/decorators.py
index 7198f419..68cc4faa 100644
--- a/weboob/tools/browser/decorators.py
+++ b/weboob/tools/browser/decorators.py
@@ -41,12 +41,16 @@ def id2url(id2url):
             else:
                 if '@' in arg:
                     _id, provider = arg.split('@')
-                    if provider in self.DOMAIN:
+                    if provider == self.DOMAIN:
                         url = id2url(_id)
+                        if url is None:
+                            return None
                     else:
                         return None
                 else:
                     url = id2url(arg)
+                    if url is None:
+                        return None
             new_args = [url]
             new_args.extend(args[1:])
             return func(self, *new_args, **kwargs)