Fix UnconfirmedEmailAddresses again