diff --git a/apimail/managers.py b/apimail/managers.py
index 2e6e02376afdd4c0d6e3dd6ce0e8915745cdd349..24d1a087b0a78d1cf508fb6d4f470fc91869dce1 100644
--- a/apimail/managers.py
+++ b/apimail/managers.py
@@ -36,7 +36,7 @@ class StoredMessageQuerySet(models.QuerySet):
         """
         if not user.is_authenticated:
             return self.none()
-        elif user.is_superuser or user.is_admin:
+        elif user.is_superuser or user.is_staff:
             return self
 
         # Filter based on account accesses
diff --git a/apimail/permissions.py b/apimail/permissions.py
index 73666b4530cc2313a4477b280c8a44f1458a4e9a..e732cc28e65a88702f1197755411fbf04ac5e7eb 100644
--- a/apimail/permissions.py
+++ b/apimail/permissions.py
@@ -14,7 +14,7 @@ class CanHandleComposedMessage(permissions.BasePermission):
     """
 
     def has_object_permission(self, request, view, obj):
-        if request.user.is_superuser or request.user.is_admin:
+        if request.user.is_superuser or request.user.is_staff:
             return True
 
         return obj.author == request.user
@@ -27,7 +27,7 @@ class CanHandleStoredMessage(permissions.BasePermission):
     """
 
     def has_object_permission(self, request, view, obj):
-        if request.user.is_superuser or request.user.is_admin:
+        if request.user.is_superuser or request.user.is_staff:
             return True
 
         # Check, based on account accesses
@@ -48,7 +48,7 @@ class CanReadStoredMessage(permissions.BasePermission):
     """
 
     def has_object_permission(self, request, view, obj):
-        if request.user.is_superuser or request.user.is_admin:
+        if request.user.is_superuser or request.user.is_staff:
             return True
 
         # Check, based on account accesses