Small fixes to multiple_emails feature