One thing I noticed was that a new account was created if you changed your email since the last time the update was run.
We probably should have saved an old uid -> new uid map
and updated emails rather than creating new ones when the
email was changed.