Refactor: Account creation and update use async waterfall