diff --git a/marteau/web/__init__.py b/marteau/web/__init__.py
index 593370c..f9226ab 100644
--- a/marteau/web/__init__.py
+++ b/marteau/web/__init__.py
@@ -18,6 +18,9 @@ def user(self):
         Get the logged in user
         """
         user = authenticated_userid(self)
+        if user is None:
+            return None
+
         # if we're authenticated we want to make sure we're authorized
         domains = self.registry.settings.get('authorized_domains',
                                              'mozilla.com')