AccountEditor2 starting to work better