Update to CI, changed form validation