Fixed email bug