Adds emails and improves form

[Works on #19184397065735]