diff --git a/apps/applications/api/account.py b/apps/applications/api/account.py
index 1874b2bab..8071125b2 100644
--- a/apps/applications/api/account.py
+++ b/apps/applications/api/account.py
@@ -35,7 +35,8 @@ class ApplicationAccountViewSet(JMSModelViewSet):
     http_method_names = ['get', 'put', 'patch', 'options']
 
     def get_queryset(self):
-        queryset = ApplicationPermission.objects.all() \
+        queryset = ApplicationPermission.objects.exclude(system_users__isnull=True) \
+            .exclude(applications__isnull=True) \
             .annotate(uid=Concat(
                 'applications', Value('_'), 'system_users', output_field=CharField()
              )) \
diff --git a/apps/applications/serializers/application.py b/apps/applications/serializers/application.py
index 3aa2c642c..73b4eb7f7 100644
--- a/apps/applications/serializers/application.py
+++ b/apps/applications/serializers/application.py
@@ -68,6 +68,7 @@ class ApplicationSerializer(ApplicationSerializerMixin, BulkOrgResourceModelSeri
 
 
 class ApplicationAccountSerializer(serializers.Serializer):
+    id = serializers.ReadOnlyField(label=_("Id"), source='uid')
     username = serializers.ReadOnlyField(label=_("Username"))
     password = serializers.CharField(write_only=True, label=_("Password"))
     systemuser = serializers.ReadOnlyField(label=_('System user'))
diff --git a/utils/check_celery.sh b/utils/check_celery.sh
new file mode 100644
index 000000000..dce8edb45
--- /dev/null
+++ b/utils/check_celery.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [[ "$(ps axu | grep 'celery' | grep -v 'grep' | grep -cv 'defunct')" == "5" ]];then
+  exit 0
+else
+  exit 1
+fi
\ No newline at end of file