A couple of small fixes.
Fix up email address submission.