Production emails fix