Fix the markup of the form submit button (see #7396)