diff --git a/AUTHORS b/AUTHORS
index 8cb1b7a05..55ac95f67 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -36,6 +36,7 @@ Jerome Leclanche
 Jim Graham
 Jonas Nygaard Pedersen
 Jonathan Steffan
+Jozef Knaperek
 Jun Zhou
 Kristian Rune Larsen
 Paul Dekkers
diff --git a/oauth2_provider/admin.py b/oauth2_provider/admin.py
index 79bcf7702..58b5308fd 100644
--- a/oauth2_provider/admin.py
+++ b/oauth2_provider/admin.py
@@ -26,6 +26,7 @@ class ApplicationAdmin(admin.ModelAdmin):
 
 class AccessTokenAdmin(admin.ModelAdmin):
     list_display = ("token", "user", "application", "expires")
+    list_select_related = ("application", "user")
     raw_id_fields = ("user", "source_refresh_token")