diff --git a/ChangeLog b/ChangeLog
index e6cc31646..5f8da4ddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-03  Robert Love  <rml@novell.com>
+
+	* src/NetworkManagerUtils.c: Even for debugging, we should not log the
+	  user's encryption key, so we print the err_msg_cmd not the command,
+	  if available.  So long as SUPPLICANT_DEBUG is default, this makes
+	  sense.
+
 2006-02-03  Christopher Aillon  <caillon@redhat.com>
 
 	* initscript/RedHat/NetworkManagerDispatcher.in:
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
index ed9808f17..27ddbf6b7 100644
--- a/src/NetworkManagerUtils.c
+++ b/src/NetworkManagerUtils.c
@@ -762,7 +762,7 @@ nm_utils_supplicant_request_with_check (struct wpa_ctrl *ctrl,
 	response = g_malloc (RESPONSE_SIZE);
 	len = RESPONSE_SIZE;
 #ifdef SUPPLICANT_DEBUG
-	nm_info ("SUP: sending command '%s'", command);
+	nm_info ("SUP: sending command '%s'", err_msg_cmd ? err_msg_cmd : command);
 #endif
 	wpa_ctrl_request (ctrl, command, strlen (command), response, &len, NULL);
 	response[len] = '\0';