diff --git a/.github/workflows/azure-login-positive.yml b/.github/workflows/azure-login-positive.yml
index a7e96001..46550cb0 100644
--- a/.github/workflows/azure-login-positive.yml
+++ b/.github/workflows/azure-login-positive.yml
@@ -207,17 +207,21 @@ jobs:
         enable-AzPSSession: true
 
     - name: Run Azure Cli
+      shell: pwsh
       run: |
-        az account show --output none
+        $checkResult = (az account list --output json | ConvertFrom-Json).Count -eq 2
+        if(-not $checkResult){
+            throw "Not all checks passed!"
+        }
 
     - name: Run Azure PowerShell
       uses: azure/powershell@v1
       with:
         azPSVersion: "latest"
         inlineScript: |
-            $checkResult = (Get-AzContext).Environment.Name -eq 'AzureCloud'
+            $checkResult = (Get-AzContext -ListAvailable).Count -eq 2
             if(-not $checkResult){
-                throw "Not all checks passed!"
+              throw "Not all checks passed!"
             }
 
     - name: Login with creds, no subscription, allow no subscription
diff --git a/src/Cli/AzureCliLogin.ts b/src/Cli/AzureCliLogin.ts
index 9bdaae7e..ec557fe6 100644
--- a/src/Cli/AzureCliLogin.ts
+++ b/src/Cli/AzureCliLogin.ts
@@ -31,8 +31,6 @@ export class AzureCliLogin {
         await this.executeAzCliCommand(["--version"], true, execOptions);
         core.debug(`Azure CLI version used:\n${output}`);
 
-        await this.executeAzCliCommand(["account", "clear"], true, execOptions);
-
         this.setAzurestackEnvIfNecessary();
 
         await this.executeAzCliCommand(["cloud", "set", "-n", this.loginConfig.environment], false);