diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
index ee67f384ca..bf36b425f5 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
@@ -1429,12 +1429,11 @@ final int getTDSPacketSize() {
 
     final boolean isKatmaiOrLater() {
         assert TDS.VER_UNKNOWN != tdsVersion;
-        assert tdsVersion >= TDS.VER_YUKON;
-        return tdsVersion >= TDS.VER_KATMAI;
+        return (tdsVersion >= TDS.VER_KATMAI || tdsVersion == TDS.VER_TDS80);
     }
 
     final boolean isDenaliOrLater() {
-        return tdsVersion >= TDS.VER_DENALI;
+        return (tdsVersion >= TDS.VER_DENALI || tdsVersion == TDS.VER_TDS80);
     }
 
     /** server major version */
@@ -6224,7 +6223,7 @@ final boolean complete(LogonCommand logonCommand, TDSReader tdsReader) throws SQ
         tdsWriter.writeShort((short) 0);
         tdsWriter.writeShort((short) 0);
 
-        if (tdsVersion >= TDS.VER_YUKON) {
+        if (tdsVersion >= TDS.VER_YUKON || tdsVersion == TDS.VER_TDS80) {
             // TDS 7.2: Password change
             tdsWriter.writeShort((short) 0);
             tdsWriter.writeShort((short) 0);