Dynamic form on validation errors

Addresses issue #904