diff --git a/modoboa/core/views/base.py b/modoboa/core/views/base.py
index 8a934ba65..69b798179 100644
--- a/modoboa/core/views/base.py
+++ b/modoboa/core/views/base.py
@@ -18,7 +18,7 @@ def find_nextlocation(request, user):
         return reverse("core:user_index")
     nextlocation = request.POST.get("next", request.GET.get("next"))
     condition = (
-        nextlocation is not None and nextlocation != "" and
+        nextlocation is not None and nextlocation != "" and nextlocation != "None" and
         is_safe_url(nextlocation, host=request.get_host())
     )
     if condition: