diff --git a/netbox/templates/users/token_edit.html b/netbox/templates/users/token_edit.html
new file mode 100644
index 000000000..49e521c55
--- /dev/null
+++ b/netbox/templates/users/token_edit.html
@@ -0,0 +1,9 @@
+{% extends 'generic/object_edit.html' %}
+{% load i18n %}
+
+{% block content %}
+  {% if not request.user.is_superuser %}
+    {% include 'inc/alerts/warning.html' with title="Creating API Tokens" message="Non-superusers should generally create and modify API tokens under their user profile." %}
+  {% endif %}
+  {{ block.super }}
+{% endblock %}
diff --git a/netbox/users/views.py b/netbox/users/views.py
index 624c8c8b4..40d69e98c 100644
--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -28,6 +28,7 @@ class TokenView(generic.ObjectView):
 class TokenEditView(generic.ObjectEditView):
     queryset = Token.objects.all()
     form = forms.TokenForm
+    template_name = 'users/token_edit.html'
 
 
 @register_model_view(Token, 'delete')