Cleanup & fix SMSG_ACCOUNT_INFO