diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f8a7ae0de27..e46e9d9d1ae 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -215,6 +215,8 @@ Improvements
 * SOLR-16470: Replication "fetch file" API now has a v2 equivalent, available at `GET /api/cores/coreName/replication/files/fileName`
   (Matthew Biscocho via Jason Gerlowski)
 
+* SOLR-17554: Suppress printing out of password to console when using auth CLI command. (Christos Malliaridis via Eric Pugh)
+
 
 Optimizations
 ---------------------
diff --git a/solr/core/src/java/org/apache/solr/cli/AuthTool.java b/solr/core/src/java/org/apache/solr/cli/AuthTool.java
index e4f9359d93b..6a71164a03d 100644
--- a/solr/core/src/java/org/apache/solr/cli/AuthTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/AuthTool.java
@@ -282,10 +282,7 @@ private void handleBasicAuth(CommandLine cli) throws Exception {
         updateIncludeFileEnableAuth(includeFile, basicAuthConfFile);
         final String successMessage =
             String.format(
-                Locale.ROOT,
-                "Successfully enabled basic auth with username [%s] and password [%s].",
-                username,
-                password);
+                Locale.ROOT, "Successfully enabled basic auth with username [%s].", username);
         echo(successMessage);
         return;
       case "disable":