diff --git a/utils.py b/utils.py
index b8d6ae965..7a3281132 100644
--- a/utils.py
+++ b/utils.py
@@ -1517,11 +1517,7 @@ def noOfAccounts(baseDir: str) -> bool:
     accountCtr = 0
     for subdir, dirs, files in os.walk(baseDir + '/accounts'):
         for account in dirs:
-            if '@' in account:
-                if account.startswith('inbox@'):
-                    continue
-                elif account.startswith('news@'):
-                    continue
+            if isAccountDir(account):
                 accountCtr += 1
         break
     return accountCtr