diff --git a/internal/cli/cli.go b/internal/cli/cli.go
index dfbb628ca..b01ffc500 100644
--- a/internal/cli/cli.go
+++ b/internal/cli/cli.go
@@ -52,7 +52,7 @@ type app struct {
 	FirstRuns map[string]bool `json:"first_runs"`
 }
 
-var errUnauthenticated = errors.New("Not yet configured. Try `auth0 login`.")
+var errUnauthenticated = errors.New("Not logged in. Try 'auth0 login'.")
 
 // cli provides all the foundational things for all the commands in the CLI,
 // specifically:
diff --git a/internal/cli/logout.go b/internal/cli/logout.go
index 4181d18eb..bf5244f98 100644
--- a/internal/cli/logout.go
+++ b/internal/cli/logout.go
@@ -21,7 +21,7 @@ func logoutCmd(cli *cli) *cobra.Command {
 			if len(args) == 0 {
 				tens, err := cli.listTenants()
 				if err != nil {
-					return fmt.Errorf("Unable to load tenants due to an unexpected error: %w", err)
+					return err // This error is already formatted for display
 				}
 
 				if len(tens) == 0 {