Work on add email popup, refs #6575