diff --git a/src/pretix/control/templates/pretixcontrol/auth/base.html b/src/pretix/control/templates/pretixcontrol/auth/base.html
index f9763cb6f6..b91ace8449 100644
--- a/src/pretix/control/templates/pretixcontrol/auth/base.html
+++ b/src/pretix/control/templates/pretixcontrol/auth/base.html
@@ -1,5 +1,6 @@
 {% load compress %}
 {% load i18n %}
+{% load hijack_tags %}
 {% load static %}
 <!DOCTYPE html>
 <html{% if rtl %} dir="rtl" class="rtl"{% endif %}>
@@ -38,6 +39,20 @@
             </div>
         {% endfor %}
     {% endif %}
+    {% if request|is_hijacked %}
+        <div class="impersonate-warning">
+            <span class="fa fa-user-secret"></span>
+            {% blocktrans with user=request.user%}You are currently working on behalf of {{ user }}.{% endblocktrans %}
+
+            <form action="{% url 'control:users.impersonate.stop' %}" method="post" class="helper-display-inline">
+                {% csrf_token %}
+                <button class="btn btn-default btn-sm">
+                    {% trans "Stop impersonating" %}
+                </button>
+            </form>
+        </div>
+    {% endif %}
+
     {% block content %}
     {% endblock %}
     <footer>
diff --git a/src/pretix/control/templates/pretixcontrol/auth/oauth_authorization.html b/src/pretix/control/templates/pretixcontrol/auth/oauth_authorization.html
index a6085b08b8..b5775472f2 100644
--- a/src/pretix/control/templates/pretixcontrol/auth/oauth_authorization.html
+++ b/src/pretix/control/templates/pretixcontrol/auth/oauth_authorization.html
@@ -4,46 +4,51 @@
 {% load i18n %}
 {% block content %}
     {% if not error %}
-	<form class="form-signin" action="" method="post">
-        <h3>{% trans "Authorize an application" %}</h3>
+        <form class="form-signin" action="" method="post">
+            <h3>{% trans "Authorize an application" %}</h3>
 
-        {% csrf_token %}
-        {% for field in form %}
-            {% if field.is_hidden %}
-                {{ field }}
-            {% endif %}
-        {% endfor %}
-
-        <p>
-            {% blocktrans trimmed with application=application.name %}
-                Do you really want to grant the application <strong>{{ application }}</strong> access to your
-                pretix account?
-            {% endblocktrans %}
-        </p>
-        <p>{% trans "The application requires the following permissions:" %}</p>
-        <ul>
-            {% for scope in scopes_descriptions %}
-                <li>{{ scope }}</li>
+            {% csrf_token %}
+            {% for field in form %}
+                {% if field.is_hidden %}
+                    {{ field }}
+                {% endif %}
             {% endfor %}
-        </ul>
-        {% if form.organizers %}
-            <p>{% trans "Please select the organizer accounts this application should get access to:" %}</p>
-            {% bootstrap_field form.organizers layout="inline" %}
-        {% endif %}
 
-        {% bootstrap_form_errors form layout="control" %}
-        <p class="text-danger">
-            {% blocktrans trimmed %}
-                This application has <strong>not</strong> been reviewed by the pretix team. Granting access to your
-                pretix account happens at your own risk.
-            {% endblocktrans %}
-        </p>
+            <p>
+                {% blocktrans trimmed with application=application.name %}
+                    Do you really want to grant the application <strong>{{ application }}</strong> access to your
+                    pretix account?
+                {% endblocktrans %}
+            </p>
+            <p>
+                {% blocktrans trimmed with user=request.user %}
+                    You are currently logged in as <strong>{{ user }}</strong>.
+                {% endblocktrans %}
+            </p>
+            <p>{% trans "The application requires the following permissions:" %}</p>
+            <ul>
+                {% for scope in scopes_descriptions %}
+                    <li>{{ scope }}</li>
+                {% endfor %}
+            </ul>
+            {% if form.organizers %}
+                <p>{% trans "Please select the organizer accounts this application should get access to:" %}</p>
+                {% bootstrap_field form.organizers layout="inline" %}
+            {% endif %}
 
-		<div class="form-group buttons">
-            <input type="submit" class="btn btn-large btn-default" value="Cancel"/>
-            <input type="submit" class="btn btn-large btn-primary" name="allow" value="Authorize"/>
-		</div>
-	</form>
+            {% bootstrap_form_errors form layout="control" %}
+            <p class="text-danger">
+                {% blocktrans trimmed %}
+                    This application has <strong>not</strong> been reviewed by the pretix team. Granting access to your
+                    pretix account happens at your own risk.
+                {% endblocktrans %}
+            </p>
+
+            <div class="form-group buttons">
+                <input type="submit" class="btn btn-large btn-default" value="Cancel"/>
+                <input type="submit" class="btn btn-large btn-primary" name="allow" value="Authorize"/>
+            </div>
+        </form>
     {% else %}
         <form class="form-signin" action="" method="post">
             <h3>{% trans "Error:" %} {{ error.error }}</h3>
diff --git a/src/pretix/static/pretixcontrol/scss/auth.scss b/src/pretix/static/pretixcontrol/scss/auth.scss
index 811f7c88bc..b44ec408eb 100644
--- a/src/pretix/static/pretixcontrol/scss/auth.scss
+++ b/src/pretix/static/pretixcontrol/scss/auth.scss
@@ -56,5 +56,17 @@ footer {
     margin-bottom: 20px;
 }
 
+.impersonate-warning {
+	background-color: #ffe761;
+	background-image: -webkit-linear-gradient(-45deg, rgba(0, 0, 0, .04) 25%, transparent 25%, transparent 50%, rgba(0, 0, 0, .04) 50%, rgba(0, 0, 0, .04) 75%, transparent 75%, transparent);
+	background-image: -moz-linear-gradient(-45deg, rgba(0, 0, 0, .04) 25%, transparent 25%, transparent 50%, rgba(0, 0, 0, .04) 50%, rgba(0, 0, 0, .04) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(135deg, rgba(0, 0, 0, .04) 25%, transparent 25%, transparent 50%, rgba(0, 0, 0, .04) 50%, rgba(0, 0, 0, .04) 75%, transparent 75%, transparent);
+	padding: 15px;
+	max-width: 330px;
+	box-shadow: 0 7px 14px 0 rgba(78, 50, 92, 0.1),0 3px 6px 0 rgba(0,0,0,.07);
+	margin: 15px auto;
+	border-radius: $border-radius-base;
+}
+
 @import "../../pretixbase/scss/_rtl.scss";
 @import "../../bootstrap/scss/_rtl.scss";
