diff --git a/apps/assets/api/domain.py b/apps/assets/api/domain.py
index e6f6c0550..e032c41bb 100644
--- a/apps/assets/api/domain.py
+++ b/apps/assets/api/domain.py
@@ -27,7 +27,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..af3fe612f 100644
--- a/apps/assets/models/domain.py
+++ b/apps/assets/models/domain.py
@@ -63,8 +63,9 @@ 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):
-            return False, _("Password should not contain special characters")
+        if self.password is not None:
+            if not re.match(r'\w+$', self.password):
+                return False, _("Password should not contain special characters")
 
         client = paramiko.SSHClient()
         client.set_missing_host_key_policy(paramiko.AutoAddPolicy())