diff --git a/packages/server/src/cli.ts b/packages/server/src/cli.ts
index 629a961d97cbe508c3883843c145bfc34d12af3b..6b809c887a75125bb7c58b475feebbe38c1ba7f8 100644
--- a/packages/server/src/cli.ts
+++ b/packages/server/src/cli.ts
@@ -315,10 +315,11 @@ const bold = (text: string | number): string | number => {
 		logger.warn("Documentation on securing your setup: https://github.com/cdr/code-server/blob/master/doc/security/ssl.md");
 	}
 
-	if (!options.noAuth && !usingCustomPassword) {
+	if (!options.noAuth) {
 		logger.info(" ");
-		logger.info(`Password:\u001B[1m ${password}`);
+		logger.info(usingCustomPassword ? "Using custom password." : `Password:\u001B[1m ${password}`);
 	} else {
+		logger.warn(" ");
 		logger.warn("Launched without authentication.");
 	}
 	if (options.disableTelemetry) {