Fix to use UserName.matches method after merge conflict resolved