nit: we could do this at the top of the case statement rather than after updating all the form stuff first