diff --git a/rest_framework/authtoken/admin.py b/rest_framework/authtoken/admin.py
index 1a507249b..750e21cf4 100644
--- a/rest_framework/authtoken/admin.py
+++ b/rest_framework/authtoken/admin.py
@@ -7,6 +7,7 @@ class TokenAdmin(admin.ModelAdmin):
     list_display = ('key', 'user', 'created')
     fields = ('user',)
     ordering = ('-created',)
+    autocomplete_fields = ('user',)
 
 
 admin.site.register(Token, TokenAdmin)