fixing mail confirmation issues