Hello Huntress Team,

I’d like to request an enhancement for the CW Automate deployment method. Currently, the Huntress script uses the ClientName from Automate to create or map organizations. If a client name is changed, Huntress creates a duplicate org/site, causing devices to check in under multiple locations.

Please consider allowing the use of unique ClientID/LocationID values (or a custom EDF) instead of ClientName. These IDs never change in CW Automate and would prevent duplicate org creation, simplify onboarding/offboarding, and keep policies/exclusions consistent.

This improvement would make deployments more stable and reduce manual cleanup.

Thank you,