AccountAdapter refactored

issue #2240