diff --git a/apps/audits/api.py b/apps/audits/api.py
index 990d4353a..b060a0eb1 100644
--- a/apps/audits/api.py
+++ b/apps/audits/api.py
@@ -34,7 +34,7 @@ class FTPLogViewSet(CreateModelMixin, ListModelMixin, OrgGenericViewSet):
     date_range_filter_fields = [
         ('date_start', ('date_from', 'date_to'))
     ]
-    filterset_fields = ['user', 'asset', 'system_user', 'filename']
+    filterset_fields = ['user', 'asset', 'account', 'filename']
     search_fields = filterset_fields
     ordering = ['-date_start']
 
diff --git a/apps/perms/filters.py b/apps/perms/filters.py
index e64e919ea..05f202655 100644
--- a/apps/perms/filters.py
+++ b/apps/perms/filters.py
@@ -13,15 +13,15 @@ class PermissionBaseFilter(BaseFilterSet):
     is_valid = filters.BooleanFilter(method='do_nothing')
     user_id = filters.UUIDFilter(method='do_nothing')
     username = filters.CharFilter(method='do_nothing')
-    system_user_id = filters.UUIDFilter(method='do_nothing')
-    system_user = filters.CharFilter(method='do_nothing')
+    account_id = filters.UUIDFilter(method='do_nothing')
+    account = filters.CharFilter(method='do_nothing')
     user_group_id = filters.UUIDFilter(method='do_nothing')
     user_group = filters.CharFilter(method='do_nothing')
     all = filters.BooleanFilter(method='do_nothing')
 
     class Meta:
         fields = (
-            'user_id', 'username', 'system_user_id', 'system_user',
+            'user_id', 'username', 'account_id', 'account',
             'user_group_id', 'user_group', 'name', 'all', 'is_valid',
         )