Making form submit consistent between wizard and non-wizard usage