diff --git a/src/backend/mailbox_manager/admin.py b/src/backend/mailbox_manager/admin.py
index 9c3969f9e..2a3d0a5de 100644
--- a/src/backend/mailbox_manager/admin.py
+++ b/src/backend/mailbox_manager/admin.py
@@ -61,7 +61,9 @@ class MailDomainAdmin(admin.ModelAdmin):
 class MailboxAdmin(admin.ModelAdmin):
     """Admin for mailbox model."""
 
-    list_display = ("__str__", "first_name", "last_name", "status")
+    list_display = ("__str__", "domain", "status")
+    list_filter = ("status",)
+    search_fields = ("local_part", "domain__name")
 
 
 @admin.register(models.MailDomainAccess)