Add generation email fix