Get Tenant ID from token request, instead of listing Tenants

Get Tenant ID from token request, instead of listing Tenants