Hotfix on account message