Setup Mail Production correction