diff --git a/server/assignments/admin.py b/server/assignments/admin.py
index 5f0774f7..4d692aca 100644
--- a/server/assignments/admin.py
+++ b/server/assignments/admin.py
@@ -7,6 +7,7 @@ from assignments.models import Assignment, StudentSubmission, SubmissionFeedback
 @admin.register(Assignment)
 class AssignmentAdmin(admin.ModelAdmin):
     list_display = ('title', 'module', 'deleted', 'owner', )
+    autocomplete_fields = ('owner',)
 
 
 @admin.register(StudentSubmission)
diff --git a/server/users/admin.py b/server/users/admin.py
index d59f867d..1b6832d5 100644
--- a/server/users/admin.py
+++ b/server/users/admin.py
@@ -47,8 +47,10 @@ class CustomUserAdmin(UserAdmin):
     add_form = CustomUserCreationForm
     form = CustomUserChangeForm
     model = User
-    list_display = ('username', 'first_name', 'last_name', 'school_classes_list')
-    list_filter = ('school_classes',)
+    list_display = ('username', 'first_name', 'last_name', 'school_classes_list', 'is_superuser')
+    list_filter = ('school_classes', 'is_superuser')
+    ordering = ['pk']
+    search_fields = ('username', 'first_name', 'last_name')
 
     inlines = [
         SchoolClassInline,