diff --git a/models/intermediate/core/int_core__property_managers_system.sql b/models/intermediate/core/int_core__property_managers_system.sql
index ede3369..9782e72 100644
--- a/models/intermediate/core/int_core__property_managers_system.sql
+++ b/models/intermediate/core/int_core__property_managers_system.sql
@@ -27,7 +27,7 @@ with
         group by 1, 2
     )
 select
-    bi.display_name as pms_name,
+    it.display_name as pms_name,
     uh.id_user_host,
     uh.id_deal,
     uh.account_type,
@@ -51,5 +51,5 @@ left join
     booking_integrations bi
     on bi.id_user_host = uh.id_user_host
     and bi.display_name = it.display_name
-where uh.is_test_account = false
+where uh.is_test_account = false and uh.has_active_pms = true
 group by 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
diff --git a/models/intermediate/core/schema.yml b/models/intermediate/core/schema.yml
index 88bd0a9..8b8a19e 100644
--- a/models/intermediate/core/schema.yml
+++ b/models/intermediate/core/schema.yml
@@ -5757,7 +5757,10 @@ models:
       - name: id_user_host
         data_type: character varying
         description: |
-          The unique ID for the host. Can be null.
+          The unique ID for the host.
+        data_tests:
+          - not_null
+          - unique
 
       - name: id_deal
         data_type: character varying
diff --git a/models/reporting/core/schema.yml b/models/reporting/core/schema.yml
index 6455b0f..90b5b39 100644
--- a/models/reporting/core/schema.yml
+++ b/models/reporting/core/schema.yml
@@ -1938,7 +1938,10 @@ models:
       - name: id_user_host
         data_type: character varying
         description: |
-          The unique ID for the host. Can be null.
+          The unique ID for the host.
+        data_tests:
+          - not_null
+          - unique
 
       - name: id_deal
         data_type: character varying