Modified UserValidator and classes that use it