diff --git a/src/azure-cli-core/azure/cli/core/_profile.py b/src/azure-cli-core/azure/cli/core/_profile.py
index 0e4c0a09550..81870ab904b 100644
--- a/src/azure-cli-core/azure/cli/core/_profile.py
+++ b/src/azure-cli-core/azure/cli/core/_profile.py
@@ -856,8 +856,8 @@ def _create_identity_instance(cli_ctx, *args, **kwargs):
# EXPERIMENTAL: Use core.use_msal_http_cache=False to turn off MSAL HTTP cache.
use_msal_http_cache = cli_ctx.config.getboolean('core', 'use_msal_http_cache', fallback=True)
- # PREVIEW: On Windows, use core.enable_broker_on_windows=true to use broker (WAM) for authentication.
- enable_broker_on_windows = cli_ctx.config.getboolean('core', 'enable_broker_on_windows', fallback=False)
+ # On Windows, use core.enable_broker_on_windows=false to disable broker (WAM) for authentication.
+ enable_broker_on_windows = cli_ctx.config.getboolean('core', 'enable_broker_on_windows', fallback=True)
from .telemetry import set_broker_info
set_broker_info(enable_broker_on_windows)
diff --git a/src/azure-cli-core/azure/cli/core/auth/landing_pages/success.html b/src/azure-cli-core/azure/cli/core/auth/landing_pages/success.html
index 309a93bf4e3..d24f2fea071 100644
--- a/src/azure-cli-core/azure/cli/core/auth/landing_pages/success.html
+++ b/src/azure-cli-core/azure/cli/core/auth/landing_pages/success.html
@@ -21,13 +21,5 @@
You have logged into Microsoft Azure!
You can close this window, or we will redirect you to the Azure CLI documentation in 1 minute.
- Announcements
- [Windows only] Azure CLI is collecting feedback on using the Web Account Manager (WAM) broker for the login experience.
- You may opt-in to use WAM by running the following commands:
-
- az config set core.enable_broker_on_windows=true
- az account clear
- az login
-