diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -441,7 +441,8 @@
                 retry_delay=retry_delay
             )
 
-        conn.set_option(ldap.OPT_TIMEOUT, 10)
+        if immediate:
+            conn.set_option(ldap.OPT_TIMEOUT, 10)
 
         conn.protocol_version = 3
         conn.supported_controls = []