Merge pull request #20860 from runcom/fix-logout-credsStore

api: client: fix login/logout with creds store