diff --git a/source/ftpSession.cpp b/source/ftpSession.cpp
index 3700f25..62b75bc 100644
--- a/source/ftpSession.cpp
+++ b/source/ftpSession.cpp
@@ -1424,7 +1424,10 @@ void FtpSession::readCommand (int const events_)
 
 		*delim = '\0';
 		decodePath (buffer, delim - buffer);
-		command ("%s\n", buffer);
+		if (::strncasecmp ("USER ", buffer, 5) == 0 || ::strncasecmp ("PASS ", buffer, 5) == 0)
+			command ("%.*s ******\n", 5, buffer);
+		else
+			command ("%s\n", buffer);
 
 		char const *const command = buffer;