diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/ConfigurationService.java b/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/ConfigurationService.java
index 62cd35e2b..83e8e8b23 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/ConfigurationService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/glyptodon/guacamole/auth/ldap/ConfigurationService.java
@@ -137,11 +137,12 @@ public class ConfigurationService {
 
     /**
      * Returns the base DN under which all Guacamole role based access control
-     * (RBAC) groups will be stored within the LDAP directory.
+     * (RBAC) groups will be stored within the LDAP directory. If RBAC will not
+     * be used, null is returned.
      *
      * @return
      *     The base DN under which all Guacamole RBAC groups will be stored
-     *     within the LDAP directory.
+     *     within the LDAP directory, or null if RBAC will not be used.
      *
      * @throws GuacamoleException
      *     If guacamole.properties cannot be parsed.