diff --git a/apps/assets/api/domain.py b/apps/assets/api/domain.py
index 421e69544..b12f8ce2c 100644
--- a/apps/assets/api/domain.py
+++ b/apps/assets/api/domain.py
@@ -29,7 +29,7 @@ class DomainViewSet(OrgBulkModelViewSet):
 
 class GatewayViewSet(OrgBulkModelViewSet):
     model = Gateway
-    filter_fields = ("domain__name", "name", "username", "ip", "domain")
+    filter_fields = ("domain__name", "name", "username", "ip", "domain__id")
     search_fields = filter_fields
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.GatewaySerializer
diff --git a/apps/assets/models/domain.py b/apps/assets/models/domain.py
index 99e677a07..b89c3b128 100644
--- a/apps/assets/models/domain.py
+++ b/apps/assets/models/domain.py
@@ -63,7 +63,7 @@ class Gateway(AssetUser):
     def test_connective(self, local_port=None):
         if local_port is None:
             local_port = self.port
-        if not re.match(r'\w+$', self.password):
+        if self.password and not re.match(r'\w+$', self.password):
             return False, _("Password should not contain special characters")
 
         client = paramiko.SSHClient()