[PD-875]

* reordered arguments for consistency
* Added `apply_email` to fieldset so it gets rendered properly.