Fix email issues
Fix issues on production env