#810 - revert all to double email field, fix double email error, and add single email option on form settings