diff --git a/netbox/users/admin.py b/netbox/users/admin.py
index 29c149f21..adfa151d5 100644
--- a/netbox/users/admin.py
+++ b/netbox/users/admin.py
@@ -1,8 +1,18 @@
+from django import forms
 from django.contrib import admin
 
 from .models import Token
 
 
+class TokenAdminForm(forms.ModelForm):
+    key = forms.CharField(required=False, help_text="If no key is provided, one will be generated automatically.")
+
+    class Meta:
+        fields = ['user', 'key', 'write_enabled', 'expires', 'description']
+        model = Token
+
+
 @admin.register(Token)
 class TokenAdmin(admin.ModelAdmin):
-    list_display = ['user', 'key', 'created', 'expires', 'write_enabled', 'description']
+    form = TokenAdminForm
+    list_display = ['key', 'user', 'created', 'expires', 'write_enabled', 'description']