Rep 892 - Tenant ID Check in Client Auth

Fingers crossed
This is a weird way to do this.