Use X-User-Id instead of X-Tenant-Id