diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/HikariDataSource.java b/hikaricp/src/main/java/com/zaxxer/hikari/HikariDataSource.java
index 065dfe9a..59600a15 100644
--- a/hikaricp/src/main/java/com/zaxxer/hikari/HikariDataSource.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/HikariDataSource.java
@@ -272,13 +272,13 @@ public class HikariDataSource extends HikariConfig implements DataSource
          if (username != null && !username.equals(otherKey.username)) {
             return false;
          }
-         else if (username != otherKey.username) {
+         else if (!username.equals(otherKey.username)) {
             return false;
          }
          else if (password != null && !password.equals(otherKey.password)) {
             return false;
          }
-         else if (password != otherKey.password) {
+         else if (!password.equals(otherKey.password)) {
             return false;
          }