Tweaks to email form