Guest portal on custom domain shortcode

I think it’s confusing, the custom domain doesn’t actually do anything. When you use the %guest_portal% shortcode on messages, at the moment, it still generates the default stay.hospitable.com/... URL in the message body, even if a custom Guest Portal domain is configured. This is confusing to guests especially when we are trying to have a branded experience for guests. The link displayed and the page they are sent to should be the custom domain not stay.hospitable.com