Varios fixes regarding email notifications