Handle empty emails for #73