Fixed GPEMAILCONFIRMATION-31