Fix edge cases blocking emails from sending