Modified UserNamePassword validator