refactor account management to mvp