[Bug] Possible regression when tenantId passed to WithAuthority differs from WithTenantIdFromAuthority

[Bug] Possible regression when tenantId passed to WithAuthority differs from WithTenantIdFromAuthority #418