userSuffix matching fixed