diff --git a/src/cmd/cli/command/commands.go b/src/cmd/cli/command/commands.go
index c8865275..63e57344 100644
--- a/src/cmd/cli/command/commands.go
+++ b/src/cmd/cli/command/commands.go
@@ -337,7 +337,8 @@ var RootCmd = &cobra.Command{
 			}
 			// Login interactively now; only do this for authorization-related errors
 			if connect.CodeOf(err) == connect.CodeUnauthenticated {
-				term.Warn(prettyError(err))
+				term.Debug("Server error:", err)
+				term.Warn("Please log in to continue.")
 
 				defer trackCmd(nil, "Login", P{"reason", err})
 				if err = cli.InteractiveLogin(cmd.Context(), client, gitHubClientId, cluster); err != nil {
@@ -528,6 +529,7 @@ Generate will write files in the current folder. You can edit them and then depl
 				if connect.CodeOf(err) != connect.CodeUnauthenticated {
 					return err
 				}
+				// TODO: persist the terms agreement in the state file
 			}
 		}
 
diff --git a/src/pkg/cli/tail.go b/src/pkg/cli/tail.go
index a7ccf4ae..bd5b82d2 100644
--- a/src/pkg/cli/tail.go
+++ b/src/pkg/cli/tail.go
@@ -153,7 +153,7 @@ func Tail(ctx context.Context, client client.Client, params TailOptions) error {
 				case connect.CodeUnknown:
 					// Ignore unknown (nil) errors
 				default:
-					term.Warn(err)
+					term.Warn(err) // TODO: use prettyError(…)
 				}
 			}
 		}
diff --git a/src/pkg/term/colorizer.go b/src/pkg/term/colorizer.go
index 5bc30a6a..e6c050b2 100644
--- a/src/pkg/term/colorizer.go
+++ b/src/pkg/term/colorizer.go
@@ -31,7 +31,7 @@ const (
 	BrightCyan = termenv.ANSIBrightCyan
 	InfoColor  = termenv.ANSIBrightMagenta
 	ErrorColor = termenv.ANSIBrightRed
-	WarnColor  = termenv.ANSIBrightYellow
+	WarnColor  = termenv.ANSIYellow      // not bright to improve readability on light backgrounds
 	DebugColor = termenv.ANSIBrightBlack // Gray
 )