diff --git a/apps/accounts/filters.py b/apps/accounts/filters.py
index a4ad3a7a7..50593dcb7 100644
--- a/apps/accounts/filters.py
+++ b/apps/accounts/filters.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-from django.db.models import Q
+from django.db.models import Q, F
 from django.utils import timezone
 from django_filters import rest_framework as drf_filters
 
@@ -28,9 +28,7 @@ class AccountFilterSet(BaseFilterSet):
     latest_updated = drf_filters.BooleanFilter(method='filter_latest')
     latest_secret_changed = drf_filters.BooleanFilter(method='filter_latest')
     latest_secret_change_failed = drf_filters.BooleanFilter(method='filter_latest')
-    is_zombie = drf_filters.BooleanFilter(method='filter_risk',)
-    is_ghost = drf_filters.BooleanFilter(method='filter_risk',)
-    is_weak_password = drf_filters.BooleanFilter(method='filter_risk',)
+    risk = drf_filters.CharFilter(method='filter_risk',)
     long_time_no_change_secret = drf_filters.BooleanFilter(method='filter_long_time')
     long_time_no_verified = drf_filters.BooleanFilter(method='filter_long_time')
 
@@ -44,10 +42,28 @@ class AccountFilterSet(BaseFilterSet):
 
     @staticmethod
     def filter_long_time(queryset, name, value):
+        date = timezone.now() - timezone.timedelta(days=30)
+
+        if name == 'long_time_no_change_secret':
+            field = 'date_change_secret'
+            confirm_field = 'change_secret_status'
+        else:
+            field = 'date_verified'
+            confirm_field = 'connectivity'
+
+        q = Q(**{f'{field}__lt': date}) | Q(**{f'{field}__isnull': True})
+        confirm_q = {f'{confirm_field}': 'na'}
+        queryset = queryset.exclude(**confirm_q).filter(q)
         return queryset
 
     @staticmethod
     def filter_risk(queryset, name, value):
+        if not value:
+            return queryset
+
+        queryset = queryset.prefetch_related('risks') \
+            .annotate(risk=F('risks__risk'), confirmed=F('risks__confirmed')) \
+            .filter(risk=value, confirmed=False)
         return queryset
 
     @staticmethod
diff --git a/apps/accounts/models/automations/__init__.py b/apps/accounts/models/automations/__init__.py
index 4c329d57b..13483eec9 100644
--- a/apps/accounts/models/automations/__init__.py
+++ b/apps/accounts/models/automations/__init__.py
@@ -1,7 +1,7 @@
 from .base import *
 from .backup_account import *
 from .change_secret import *
+from .check_account import *
 from .gather_account import *
 from .push_account import *
-from .scan_account import *
 from .verify_account import *
diff --git a/apps/accounts/models/automations/scan_account.py b/apps/accounts/models/automations/check_account.py
similarity index 90%
rename from apps/accounts/models/automations/scan_account.py
rename to apps/accounts/models/automations/check_account.py
index a34f9f5fe..f0a70b97e 100644
--- a/apps/accounts/models/automations/scan_account.py
+++ b/apps/accounts/models/automations/check_account.py
@@ -45,3 +45,10 @@ class AccountRisk(JMSOrgBaseModel):
     account = models.ForeignKey('Account', on_delete=models.CASCADE, related_name='risks', verbose_name=_('Account'))
     risk = models.CharField(max_length=128, verbose_name=_('Risk'), choices=RiskChoice.choices)
     confirmed = models.BooleanField(default=False, verbose_name=_('Confirmed'))
+
+    class Meta:
+        verbose_name = _('Account risk')
+        unique_together = [('account', 'risk'),]
+
+    def __str__(self):
+        return f"{self.account} - {self.risk}"