fix bug with UsernameUniqueAcrossTenants