diff --git a/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java b/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java
index 3ea830b30..231b062c2 100644
--- a/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java
+++ b/src/main/java/com/zaxxer/hikari/util/DriverDataSource.java
@@ -120,9 +120,18 @@ public Connection getConnection() throws SQLException
    }
 
    @Override
-   public Connection getConnection(String username, String password) throws SQLException
+   public Connection getConnection(final String username, final String password) throws SQLException
    {
-      return getConnection();
+      final Properties cloned = (Properties) driverProperties.clone();
+      if (username != null) {
+         cloned.put("user", username);
+         cloned.put("username", username);
+      }
+      if (password != null) {
+         cloned.put("password", password);
+      }
+
+      return driver.connect(jdbcUrl, cloned);
    }
 
    @Override