diff --git a/server/vbv_lernwelt/learning_mentor/admin.py b/server/vbv_lernwelt/learning_mentor/admin.py
index 112b4838..c23b8514 100644
--- a/server/vbv_lernwelt/learning_mentor/admin.py
+++ b/server/vbv_lernwelt/learning_mentor/admin.py
@@ -12,8 +12,11 @@ class LearningMentorAdmin(admin.ModelAdmin):
 
     list_display = ["mentor", "course", "participant_count"]
 
+    search_fields = ["mentor__email"]
+
 
 @admin.register(MentorInvitation)
 class MentorInvitationAdmin(admin.ModelAdmin):
     list_display = ["id", "email", "participant", "created"]
     readonly_fields = ["id", "created"]
+    search_fields = ["email"]
diff --git a/server/vbv_lernwelt/shop/admin.py b/server/vbv_lernwelt/shop/admin.py
index 5432cc18..4bbf4168 100644
--- a/server/vbv_lernwelt/shop/admin.py
+++ b/server/vbv_lernwelt/shop/admin.py
@@ -32,6 +32,8 @@ class CheckoutInformationAdmin(admin.ModelAdmin):
         "state",
         "invoice_transmitted_at",
     )
+    search_fields = ["user__email"]
+    list_filter = ("state", "product_name")
     actions = [generate_invoice, sync_transaction_state]