diff --git a/oauth2_provider/admin.py b/oauth2_provider/admin.py
index bd26dddb1..cf41ec5b2 100644
--- a/oauth2_provider/admin.py
+++ b/oauth2_provider/admin.py
@@ -25,6 +25,7 @@ class ApplicationAdmin(admin.ModelAdmin):
         "client_type": admin.HORIZONTAL,
         "authorization_grant_type": admin.VERTICAL,
     }
+    search_fields = ("name",) + (("user__email",) if has_email else ())
     raw_id_fields = ("user",)
 
 
@@ -39,12 +40,13 @@ class AccessTokenAdmin(admin.ModelAdmin):
 class GrantAdmin(admin.ModelAdmin):
     list_display = ("code", "application", "user", "expires")
     raw_id_fields = ("user",)
+    search_fields = ("code",) + (("user__email",) if has_email else ())
 
 
 class IDTokenAdmin(admin.ModelAdmin):
     list_display = ("jti", "user", "application", "expires")
     raw_id_fields = ("user",)
-    search_fields = ("token",) + (("user__email",) if has_email else ())
+    search_fields = ("user__email",) if has_email else ()
     list_filter = ("application",)