Make form validation nicer

#1