make form submission work with one click+issues

Sometimes it's taking two on forms. No really clear pattern, but may be associated with nesting and/or there being files or images in the form.