diff --git a/ChangeLog b/ChangeLog
index b7e4642b89..1f9551cd1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,7 @@ phpMyAdmin - ChangeLog
 - issue #13489 Fixed rendering SQL lint errors
 - issue #13468 Avoid breakage if set_time_limit is disabled
 - issue #13471 Fail if ini_set/ini_get are disabled
+- issue #13436 Automatically connect using SSL when server is configured so
 
 4.7.2 (2017-06-29)
 - issue #13314 Make theme selection keep current server
diff --git a/libraries/classes/Dbi/DbiMysqli.php b/libraries/classes/Dbi/DbiMysqli.php
index 45423e6374..04b8e254f2 100644
--- a/libraries/classes/Dbi/DbiMysqli.php
+++ b/libraries/classes/Dbi/DbiMysqli.php
@@ -95,11 +95,11 @@ class DbiMysqli implements DbiExtension
         /* Optionally enable SSL */
         if ($server['ssl']) {
             $client_flags |= MYSQLI_CLIENT_SSL;
-            if (! is_null($server['ssl_key']) ||
-                ! is_null($server['ssl_cert']) ||
-                ! is_null($server['ssl_ca']) ||
-                ! is_null($server['ssl_ca_path']) ||
-                ! is_null($server['ssl_ciphers'])
+            if (! empty($server['ssl_key']) ||
+                ! empty($server['ssl_cert']) ||
+                ! empty($server['ssl_ca']) ||
+                ! empty($server['ssl_ca_path']) ||
+                ! empty($server['ssl_ciphers'])
             ) {
                 mysqli_ssl_set(
                     $link,
@@ -143,6 +143,24 @@ class DbiMysqli implements DbiExtension
         );
 
         if ($return_value === false || is_null($return_value)) {
+            /*
+             * Switch to SSL if server asked us to do so
+             *
+             * - MySQL 8.0 and newer should return error 3159
+             * - older use #2001 - SSL Connection is required. Please specify SSL options and retry.
+             */
+            $error_number = mysqli_connect_errno();
+            $error_message = mysqli_connect_error();
+            if (! $server['ssl'] && ($error_number == 3159 ||
+                ($error_number == 2001 && stripos($error_message, 'SSL Connection is required') !== false))
+            ) {
+                    trigger_error(
+                        _('SSL connection enforced by server, automatically enabling it.'),
+                        E_USER_WARNING
+                    );
+                    $server['ssl'] = true;
+                    return self::connect($user, $password, $server);
+            }
             return false;
         }