Account name fix
Alerts fix
Merge branch 'hotfix/hotfix'