Fixed emails going out