Merge "Correctly update database during account rename."