success=true and email fix