diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/JdbcDatabasePlatformFactory.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/JdbcDatabasePlatformFactory.java
index 0af8a295fe..0dacf12aff 100644
--- a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/JdbcDatabasePlatformFactory.java
+++ b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/JdbcDatabasePlatformFactory.java
@@ -257,13 +257,15 @@ public static String[] determineDatabaseNameVersionSubprotocol(DataSource dataSo
                 }
             }
 
+            if (nameVersion[2].equalsIgnoreCase("as400")) {
+                nameVersion[0] = DatabaseNamesConstants.DB2AS400;
+            }
+
             if (nameVersion[0].toLowerCase().indexOf(DatabaseNamesConstants.DB2) != -1 && nameVersion[2].equalsIgnoreCase("db2")) {
                 String productVersion = getDatabaseProductVersion(dataSource);
                 if (nameVersion[0].toUpperCase().indexOf("Z") != -1
                         || (productVersion != null && productVersion.startsWith("DSN"))) {
                     nameVersion[0] = DatabaseNamesConstants.DB2ZOS;
-                } else if (nameVersion[0].indexOf("400") != -1) {
-                    nameVersion[0] = DatabaseNamesConstants.DB2AS400;
                 } else {
                     nameVersion[0] = DatabaseNamesConstants.DB2;
                 }