Support also + as separator between username and tenantname