diff --git a/modoboa/lib/middleware.py b/modoboa/lib/middleware.py
index 55fdcd078..3d099d28f 100644
--- a/modoboa/lib/middleware.py
+++ b/modoboa/lib/middleware.py
@@ -59,5 +59,10 @@ class RequestCatcherMiddleware(singleton.Singleton):
     def process_request(self, request):
         self._request = request
 
+    def process_response(self, request, response):
+        """Empty self._request."""
+        self._request = None
+        return response
+
     def __call__(self, **kwargs):
         return self._request
diff --git a/modoboa/limits/handlers.py b/modoboa/limits/handlers.py
index 1588fecbb..834c36bab 100644
--- a/modoboa/limits/handlers.py
+++ b/modoboa/limits/handlers.py
@@ -37,7 +37,8 @@ def create_user_limits(sender, instance, **kwargs):
         ct = ContentType.objects.get_by_natural_key(
             *definition["content_type"].split("."))
         max_value = 0
-        if creator and creator.is_superuser:
+        # creator can be None if user was created by a factory
+        if not creator or creator.is_superuser:
             max_value = int(
                 parameters.get_admin("DEFLT_{}_LIMIT".format(name.upper())))
         models.ObjectLimit.objects.create(