Fixed flag email, endless email notifications