diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java
index 3dbbe3b26..331707c38 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java
@@ -85,12 +85,13 @@ public class PostgreSQLAuthenticationProviderModule implements Module {
         if (sslMode != PostgreSQLSSLMode.PREFER)
             driverProperties.setProperty("sslmode", sslMode.getDriverValue());
         
+        // If SSL is requested disabled, also set the legacy property.
+        if (sslMode == PostgreSQLSSLMode.DISABLE)
+            driverProperties.setProperty("ssl", "false");
+        
         // If SSL is enabled, check for and set other SSL properties.
-        if (sslMode != PostgreSQLSSLMode.DISABLE) {
+        else {
             
-            // Sets the legacy SSL configuration mode required by older servers.
-            driverProperties.setProperty("ssl", "true");
-
             File sslClientCert = environment.getPostgreSQLSSLClientCertFile();
             if (sslClientCert != null)
                 driverProperties.setProperty("sslcert", sslClientCert.getAbsolutePath());