diff --git a/library/Icinga/Protocol/Ldap/LdapCapabilities.php b/library/Icinga/Protocol/Ldap/LdapCapabilities.php
index e98c57818..1ee64eaba 100644
--- a/library/Icinga/Protocol/Ldap/LdapCapabilities.php
+++ b/library/Icinga/Protocol/Ldap/LdapCapabilities.php
@@ -263,14 +263,15 @@ class LdapCapabilities
      * Discover the capabilities of the given LDAP server
      *
      * @param   LdapConnection  $connection The ldap connection to use
-     * @param   int             $ds         The link identifier of the current LDAP connection
      *
      * @return  LdapCapabilities
      *
      * @throws  LdapException       In case the capability query has failed
      */
-    public static function discoverCapabilities(LdapConnection $connection, $ds)
+    public static function discoverCapabilities(LdapConnection $connection)
     {
+        $ds = $connection->getConnection();
+
         $fields = array(
             'defaultNamingContext',
             'namingContexts',
diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php
index 099c25006..319293e2a 100644
--- a/library/Icinga/Protocol/Ldap/LdapConnection.php
+++ b/library/Icinga/Protocol/Ldap/LdapConnection.php
@@ -261,7 +261,7 @@ class LdapConnection implements Selectable, Inspectable
     {
         if ($this->capabilities === null) {
             try {
-                $this->capabilities = $this->discoverCapabilities($this->getConnection());
+                $this->capabilities = LdapCapabilities::discoverCapabilities($this);
                 $this->discoverySuccess = true;
             } catch (LdapException $e) {
                 Logger::debug($e);
@@ -1031,7 +1031,7 @@ class LdapConnection implements Selectable, Inspectable
 
         // Try to execute a schema discovery, this may fail if schema discovery is not supported
         try {
-            $cap = LdapCapabilities::discoverCapabilities($this, $ds);
+            $cap = LdapCapabilities::discoverCapabilities($this);
             $infos []= $cap->getVendor();
 
             $version = $cap->getVersion();