Fixed email issues
Fixed email issues