Rep 892 - Tenant ID Check in Client Auth

Fingers crossed
tenants.clear() is probably more clear... heh.