Hotfix: fix broken account form
Merge branch 'hotfix/0.2.20.1'