PR #10045 review: one accounts flow for agents