fix on adding emails
Merge branch 'multipleEmail' into testing