diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/Util.java b/src/main/java/com/microsoft/sqlserver/jdbc/Util.java
index bac845335..620d3d8dd 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/Util.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/Util.java
@@ -373,9 +373,14 @@ else if (ch == ':')
                         name = SQLServerDriver.getNormalizedPropertyName(name, logger);
                         if (null != name) {
                             if (logger.isLoggable(Level.FINE)) {
-                                if ((false == name.equals(SQLServerDriverStringProperty.USER.toString()))
-                                        && (false == name.equals(SQLServerDriverStringProperty.PASSWORD.toString())))
-                                    logger.fine("Property:" + name + " Value:" + value);
+                                if (false == name.equals(SQLServerDriverStringProperty.USER.toString())) {
+                                    if (!name.toLowerCase().contains("password")) {
+                                        logger.fine("Property:" + name + " Value:" + value);
+                                    }
+                                    else {
+                                        logger.fine("Property:" + name);
+                                    }
+                                }
                             }
                             p.put(name, value);
                         }