Bugs fixes and enhancements to AccountEditor