[WIP] account: implementing fixes specified in pull request 3345