Fix Email Bug