Fixed issue with not getting emails