[WIP] account: changes from manual reconciliation branch