diff --git a/CHANGES b/CHANGES
index 104735cf..2a52fe45 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,13 @@ Changes in 2.2.5
  * Fixed bug in code that sets HikariConfig values from a Properties instance
    that prevented defaults from being read properly.
 
+ * Fixed an obscure bug in connection creation with a driver that throws an
+   exception when setTransactionIsolation() is called with the value returned
+   by getTransactionIsolation().  We now bypass setTransactionIsolation() if
+   the user has not configured an isolation level (using the default).
+
+ * Fix a bug where DataSource.loginTimeout() was always being set to 1 second.
+
 Changes in 2.2.4
 
  * Generate proxy classes into the same protection domain as the HikariCP
diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java
index 7a921559..71293931 100644
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java
@@ -326,7 +326,7 @@ public final class PoolUtilities
    {
       if (connectionTimeout != Integer.MAX_VALUE) {
          try {
-            dataSource.setLoginTimeout((int) TimeUnit.MILLISECONDS.toSeconds(Math.min(1000L, connectionTimeout)));
+            dataSource.setLoginTimeout((int) TimeUnit.MILLISECONDS.toSeconds(Math.max(1000L, connectionTimeout)));
          }
          catch (SQLException e) {
             logger.warn("Unable to set DataSource login timeout", e);
diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java b/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java
index 4e4cfaff..32d79f06 100644
--- a/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/util/PoolUtilities.java
@@ -290,7 +290,7 @@ public final class PoolUtilities
    {
       if (connectionTimeout != Integer.MAX_VALUE) {
          try {
-            dataSource.setLoginTimeout((int) TimeUnit.MILLISECONDS.toSeconds(Math.min(1000L, connectionTimeout)));
+            dataSource.setLoginTimeout((int) TimeUnit.MILLISECONDS.toSeconds(Math.max(1000L, connectionTimeout)));
          }
          catch (SQLException e) {
             logger.warn("Unable to set DataSource login timeout", e);