diff --git a/backend/mixins.py b/backend/mixins.py
index 5007f03741e7edad0fcd01b57277ef574a4cff5c..95a48a3dffdfa56d16ca22fe0f463ebffc0d86c6 100644
--- a/backend/mixins.py
+++ b/backend/mixins.py
@@ -22,16 +22,13 @@ class OverrideView(Exception):
 
 class VisitorMixin(NM2LayoutMixin):
     """
-    Add self.visitor and self.impersonator to the View for the person visiting
-    the site
+    Add self.visitor to the View for the person visiting the site
     """
     # Define to "dd" "am" or "admin" to raise PermissionDenied if the
     # given test on the visitor fails
     require_visitor = None
 
     def set_visitor_info(self):
-        self.impersonator = getattr(self.request, "impersonator", None)
-
         if not self.request.user.is_authenticated:
             self.visitor = None
         else:
@@ -70,7 +67,6 @@ class VisitorMixin(NM2LayoutMixin):
     def get_context_data(self, **kw):
         ctx = super(VisitorMixin, self).get_context_data(**kw)
         ctx["visitor"] = self.visitor
-        ctx["impersonator"] = self.impersonator
         return ctx
 
 
diff --git a/nmlayout/templates/nm2-base.html b/nmlayout/templates/nm2-base.html
index 18358e064f391990c788ff8a2356a1f2195e28a5..a6f10d24b85339d8c8b54ff52998dec8a1843d45 100644
--- a/nmlayout/templates/nm2-base.html
+++ b/nmlayout/templates/nm2-base.html
@@ -78,10 +78,10 @@ window.nm2.url_api_people = "{% url 'api_people' %}";
   </a>
   <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="navbarDropdown">
   {% block visitor_menu %}
-    {% if impersonator %}
+    {% if request.impersonator %}
     <form class="form-inline" method="POST" action="{% url 'impersonate:impersonate' %}">{% csrf_token %}
       <input type="hidden" name="next" value="{{request.build_absolute_uri}}">
-      <button class="dropdown-item btn btn-link" type="submit"><span class="fa fa-random"></span> (really {{impersonator.lookup_key}})</button>
+      <button class="dropdown-item btn btn-link" type="submit"><span class="fa fa-random"></span> (really {{request.impersonator.lookup_key}})</button>
     </form>
     {% endif %}
     {% if user.is_anonymous %}
@@ -119,9 +119,9 @@ window.nm2.url_api_people = "{% url 'api_people' %}";
 
 {% block page_lead %}
 {{super}}
-{% if impersonator %}
+{% if request.impersonator %}
 <div id="impersonation" class="container-fluid bg-warning">
-<span class="badge badge-pill badge-light"><span class="fa fa-random"></span> {{impersonator.a_link}} as {{visitor.a_link}}</span>
+<span class="badge badge-pill badge-light"><span class="fa fa-random"></span> {{request.impersonator.a_link}} as {{visitor.a_link}}</span>
 <form class="form-inline" method="POST" action="{% url 'impersonate:impersonate' %}">{% csrf_token %}
   <input type="hidden" name="next" value="{{request.build_absolute_uri}}">
   <button class="badge badge-pill badge-primary" type="submit">{% trans "Cancel" %}</button>
diff --git a/signon/templates/signon/login.html b/signon/templates/signon/login.html
index 1560e24342b715ee8a7de5d5123fc551b8cf3bad..12c3695cbca5322d863acc135d252da377b49807 100644
--- a/signon/templates/signon/login.html
+++ b/signon/templates/signon/login.html
@@ -6,7 +6,7 @@
 
 <h1>nm.debian.org login</h1>
 
-{% if not impersonator %}
+{% if not request.impersonator %}
 {% if not providers_active and not providers_inactive %}
   <p class="lead">
   {% blocktrans %}