diff --git a/membershipworks/admin.py b/membershipworks/admin.py
index c6a8c44..6625946 100644
--- a/membershipworks/admin.py
+++ b/membershipworks/admin.py
@@ -100,6 +100,7 @@ class EventMeetingTimeInline(admin.TabularInline):
 @admin.register(EventInstructor)
 class EventInstructorAdmin(admin.ModelAdmin):
     autocomplete_fields = ["member"]
+    search_fields = ["name", "member"]
 
 
 @admin.register(EventExt)
@@ -123,6 +124,7 @@ class EventAdmin(admin.ModelAdmin):
     search_fields = ["eid", "title", "url"]
     date_hierarchy = "start"
     exclude = ["url"]
+    autocomplete_fields = ["instructor"]
 
     @property
     def readonly_fields(self):