diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5331de557..758a9309f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,15 @@ Canonical reference for changes, improvements, and bugfixes for Boundary.
 
 ### Deprecations/Changes
 
+* The behavior when `cors_enabled` is not specified for a listener is changing
+  to be equivalent to a `cors_allowed_origins` value of `*`; that is, accept all
+  origins. This allows Boundary, by default, to have the admin UI and desktop
+  client work without further specification of origins by the operator. This is
+  only affecting default behavior; if `cors_enabled` is explicitly set to
+  `true`, the behavior will be the same as before. This had been changed in
+  v0.2.1 due to a bug found in v0.2.0 that caused all origins to always be
+  allowed, but fixing that bug exposed that the default behavior was difficult
+  for users to configure to simply get up and running.
 * If a `cancel` operation is run on a session already in a canceling or
   terminated state, a `200` and the session information will be returned instead
   of an error.
@@ -16,6 +25,11 @@ Canonical reference for changes, improvements, and bugfixes for Boundary.
   already-canceled or terminated session
   ([PR](https://github.com/hashicorp/boundary/pull/1243))
 
+### Bug Fixes
+
+* cors: Change the default allowed origins when `cors_enabled` is not specified
+  to be `*`. ([PR](https://github.com/hashicorp/boundary/pull/1249))
+
 ## 0.2.2 (2021/05/17)
 
 ### New and Improved
@@ -163,9 +177,9 @@ Canonical reference for changes, improvements, and bugfixes for Boundary.
   behavior to automatically include the origin of the Desktop Client. This will
   be fixed in 0.2.1. In the meantime, this can be worked around by either
   explicitly disabing CORS with `cors_enabled = false` in the `listener` config
-  block with purpose `api`; or setting an `allowed_origins` field to have values
-  other than `serve://boundary` (including values that do not map to any real
-  origin).
+  block with purpose `api`; or setting a `cors_allowed_origins` field to have
+  values other than `serve://boundary` (including values that do not map to any
+  real origin).
 
 ### Deprecations/Changes
 
@@ -325,9 +339,9 @@ for more details.
     `create` or `list`. This format operates only on collections so assigning
     more actions this way will never work
 * CORS: CORS is now turned on by default when running with `boundary server`
-  with an `allowed_origins` value of `serve://boundary`. You can disable it with
-  `cors_enabled = false`, or if you want to change parameters, set `cors_enabled
-  = true` and the other related configuration values.
+  with a `cors_allowed_origins` value of `serve://boundary`. You can disable it
+  with `cors_enabled = false`, or if you want to change parameters, set
+  `cors_enabled = true` and the other related configuration values.
 
 ### New and Improved
 
diff --git a/internal/cmd/config/config.go b/internal/cmd/config/config.go
index c1d9f2007..98d62ce44 100644
--- a/internal/cmd/config/config.go
+++ b/internal/cmd/config/config.go
@@ -341,17 +341,22 @@ func Parse(d string) (*Config, error) {
 	for _, listener := range result.SharedConfig.Listeners {
 		if strutil.StrListContains(listener.Purpose, "api") &&
 			(listener.CorsDisableDefaultAllowedOriginValues == nil || !*listener.CorsDisableDefaultAllowedOriginValues) {
-			// If CORS wasn't specified, enable default values
-			if listener.CorsEnabled == nil {
+			switch listener.CorsEnabled {
+			case nil:
+				// If CORS wasn't specified, enable default value of *, which allows
+				// both the admin UI (without the user having to explicitly set an
+				// origin) and the desktop origin
 				listener.CorsEnabled = new(bool)
 				*listener.CorsEnabled = true
-				listener.CorsAllowedOrigins = []string{desktopCorsOrigin}
-			}
-			// If not the wildcard and they haven't disabled us auto-adding
-			// origin values, add the desktop client origin
-			if *listener.CorsEnabled &&
-				!strutil.StrListContains(listener.CorsAllowedOrigins, "*") {
-				listener.CorsAllowedOrigins = strutil.AppendIfMissing(listener.CorsAllowedOrigins, desktopCorsOrigin)
+				listener.CorsAllowedOrigins = []string{"*"}
+
+			default:
+				// If not the wildcard and they haven't disabled us auto-adding
+				// origin values, add the desktop client origin
+				if *listener.CorsEnabled &&
+					!strutil.StrListContains(listener.CorsAllowedOrigins, "*") {
+					listener.CorsAllowedOrigins = strutil.AppendIfMissing(listener.CorsAllowedOrigins, desktopCorsOrigin)
+				}
 			}
 		}
 	}
diff --git a/internal/cmd/config/config_test.go b/internal/cmd/config/config_test.go
index 8a6062a4c..c1adc7927 100644
--- a/internal/cmd/config/config_test.go
+++ b/internal/cmd/config/config_test.go
@@ -126,7 +126,7 @@ func TestDevController(t *testing.T) {
 		assert.NoError(t, err)
 		l0 = actual.Listeners[0]
 		assert.True(t, *l0.CorsEnabled)
-		assert.Equal(t, []string{desktopCorsOrigin}, l0.CorsAllowedOrigins)
+		assert.Equal(t, []string{"*"}, l0.CorsAllowedOrigins)
 		assert.Nil(t, l0.CorsDisableDefaultAllowedOriginValues)
 
 		// Disabled, default behavior