Settings module added to allow using custom email field or second email field + form updated