Fixed Email Bug