[AccountManager] Fixed #733