Move email into it's own form.