Fix updating email addresses and add a spec for it