Fix UnconfirmedEmailAddresses