Form validation reworked so you don't need required