Production emails fix

Fixed issue on production with sending emails