Change main email
Merge branch 'mail-setup'