diff --git a/server/users/admin.py b/server/users/admin.py
index b4be2245..d59f867d 100644
--- a/server/users/admin.py
+++ b/server/users/admin.py
@@ -23,6 +23,8 @@ class SchoolClassAdmin(admin.ModelAdmin):
         SchoolClassInline
     ]
 
+    search_fields = ['name', 'users__username']
+
     def user_list(self, obj):
         return ', '.join([s.username for s in obj.users.all()])