Fixed email issue