Production email fix