Refactor - Improve the selection of accounts in multiple contexts