diff --git a/modules/ldap/config/identity.php b/modules/ldap/config/identity.php
index 70947d71..370d973a 100644
--- a/modules/ldap/config/identity.php
+++ b/modules/ldap/config/identity.php
@@ -41,7 +41,7 @@ $config["ldap"] = array(
     "url" => "ldaps://ldap.corp.google.com/",
     "group_domain" => "ou=Posix,ou=Groups,dc=google,dc=com",
     "user_domain" => "ou=People,dc=google,dc=com",
-    "bind_rdn" => NULL,
-    "bind_password" => NULL,
+    "bind_rdn" => null,
+    "bind_password" => null,
   )
 );
diff --git a/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php b/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php
index 56722a8a..8fc45758 100644
--- a/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php
+++ b/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php
@@ -31,7 +31,11 @@ class IdentityProvider_Ldap_Driver implements IdentityProvider_Driver {
     self::$_params = $params;
     self::$_connection = ldap_connect(self::$_params["url"]);
     ldap_set_option(self::$_connection, LDAP_OPT_PROTOCOL_VERSION, 3);
-    ldap_bind(self::$_connection, self::$_params["bind_rdn"], self::$_params["bind_password"]);
+    if (self::$_params["bind_rdn"]) {
+      ldap_bind(self::$_connection, self::$_params["bind_rdn"], self::$_params["bind_password"]);
+    } else {
+      ldap_bind(self::$_connection);
+    }
   }
 
   /**