diff --git a/trojstenid/badges/admin.py b/trojstenid/badges/admin.py
index 99a8287..dac7a6d 100644
--- a/trojstenid/badges/admin.py
+++ b/trojstenid/badges/admin.py
@@ -5,6 +5,11 @@
 
 class BadgeAssignmentInline(admin.TabularInline):
     model = BadgeAssignment
+    autocomplete_fields = ["user"]
+
+    def get_queryset(self, request):
+        qs = super().get_queryset(request)
+        return qs.select_related("badge", "user")
 
 
 @admin.register(Badge)