NXP-11987: do not check if it is the same user names; always try to use the tenantId of the user. Fallback on default behavior only when hte tenantId is blank