fixed email issues