Refactor account task
Merge branch 'hotfix/refactor_account_task'