diff --git a/src/c3nav/mapdata/middleware.py b/src/c3nav/mapdata/middleware.py
index d6de2993..2461f666 100644
--- a/src/c3nav/mapdata/middleware.py
+++ b/src/c3nav/mapdata/middleware.py
@@ -1,6 +1,8 @@
 import re
 from functools import wraps
 
+from c3nav.mapdata.utils.user import get_user_data_lazy
+
 
 class NoLanguageMiddleware:
     def __init__(self, get_response):
@@ -38,3 +40,12 @@ def no_language(keep_content_language=False):
             return response
         return wrapper
     return decorator
+
+
+class GetUserDataMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        request.user_data = get_user_data_lazy(request)
+        return self.get_response(request)
diff --git a/src/c3nav/settings.py b/src/c3nav/settings.py
index 7d2b6e46..5fbe9dd2 100644
--- a/src/c3nav/settings.py
+++ b/src/c3nav/settings.py
@@ -268,7 +268,6 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
-                'c3nav.mapdata.context_processors.user_data',
             ],
             'loaders': template_loaders
         },
diff --git a/src/c3nav/site/templates/site/base.html b/src/c3nav/site/templates/site/base.html
index 6915a459..bee01400 100644
--- a/src/c3nav/site/templates/site/base.html
+++ b/src/c3nav/site/templates/site/base.html
@@ -21,8 +21,8 @@
         <header>
             <h1><a href="{% block header_title_url %}/{% endblock %}">{% block header_title %}c3nav{% endblock %}</a></h1>
             <a href="/account/" id="user">
-                <span>{{ user_data.title }}</span>
-                <small>{% if user_data.subtitle %}{{ user_data.subtitle }}{% endif %}</small>
+                <span>{{ request.user_data.title }}</span>
+                <small>{% if request.user_data.subtitle %}{{ request.user_data.subtitle }}{% endif %}</small>
             </a>
         </header>
     {% endif %}