Adding guest mails and switching to Mandrill