diff --git a/program/lib/Roundcube/rcube_ldap_generic.php b/program/lib/Roundcube/rcube_ldap_generic.php
index 252eafabe..25fe2e5d2 100644
--- a/program/lib/Roundcube/rcube_ldap_generic.php
+++ b/program/lib/Roundcube/rcube_ldap_generic.php
@@ -175,9 +175,11 @@ class rcube_ldap_generic
         $this->_debug("C: Connect to $hostname [{$this->config['name']}]");
 
         if ($lc = @ldap_connect($host, $this->config['port'])) {
-            if ($this->config['use_tls'] === true)
-                if (!ldap_start_tls($lc))
-                    continue;
+            if ($this->config['use_tls'] === true) {
+                if (!ldap_start_tls($lc)) {
+                    return false;
+                }
+            }
 
             $this->_debug("S: OK");
 
@@ -186,7 +188,7 @@ class rcube_ldap_generic
             $this->conn = $lc;
 
             if (!empty($this->config['network_timeout']))
-              ldap_set_option($lc, LDAP_OPT_NETWORK_TIMEOUT, $this->config['network_timeout']);
+                ldap_set_option($lc, LDAP_OPT_NETWORK_TIMEOUT, $this->config['network_timeout']);
 
             if (isset($this->config['referrals']))
                 ldap_set_option($lc, LDAP_OPT_REFERRALS, $this->config['referrals']);