Fixed email issues