diff --git a/Source/MQTTnet/Packets/MqttConnectPacket.cs b/Source/MQTTnet/Packets/MqttConnectPacket.cs
index 8c7ae464..18893977 100644
--- a/Source/MQTTnet/Packets/MqttConnectPacket.cs
+++ b/Source/MQTTnet/Packets/MqttConnectPacket.cs
@@ -27,7 +27,13 @@
 
         public override string ToString()
         {
-            return string.Concat("Connect: [ProtocolLevel=", ProtocolLevel, "] [ClientId=", ClientId, "] [Username=", Username, "] [Password=", Password, "] [KeepAlivePeriod=", KeepAlivePeriod, "] [CleanSession=", CleanSession, "]");
+            var password = Password;
+            if (!string.IsNullOrEmpty(password))
+            {
+                password = "****";
+            }
+
+            return string.Concat("Connect: [ProtocolLevel=", ProtocolLevel, "] [ClientId=", ClientId, "] [Username=", Username, "] [Password=", password, "] [KeepAlivePeriod=", KeepAlivePeriod, "] [CleanSession=", CleanSession, "]");
         }
     }
 }