diff --git a/keystone/identity/backends/hybrid-idm.py b/keystone/identity/backends/hybrid-idm.py
index 7506395bb..1e578943e 100644
--- a/keystone/identity/backends/hybrid-idm.py
+++ b/keystone/identity/backends/hybrid-idm.py
@@ -5,12 +5,15 @@
 from keystone.identity.backends import sql
 from keystone.identity.backends import ldap
 from keystone.openstack.common import log as logging
-from keystone import config
+from oslo.config import cfg
+from keystone import config as ks_cfg
 from keystone.common.ldap import core
 import uuid
 import re
 
-CONF = config.CONF
+CONF = ks_cfg.CONF
+ks_cfg.CONF.register_opt(cfg.ListOpt('builtin_users'), group='ldap')
+
 DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id
 LDAP_BIND_USER = CONF.ldap.user
 LDAP_BIND_PASSWORD = CONF.ldap.password
diff --git a/keystone/identity/backends/hybrid.py b/keystone/identity/backends/hybrid.py
index cf58e8599..cc62769d1 100644
--- a/keystone/identity/backends/hybrid.py
+++ b/keystone/identity/backends/hybrid.py
@@ -5,12 +5,15 @@
 from keystone.identity.backends import sql
 from keystone.identity.backends import ldap
 from keystone.openstack.common import log as logging
-from keystone import config
+from oslo.config import cfg
+from keystone import config as ks_cfg
 from keystone.common.ldap import core
 import uuid
 import re
 
-CONF = config.CONF
+CONF = ks_cfg.CONF
+ks_cfg.CONF.register_opt(cfg.ListOpt('builtin_users'), group='ldap')
+
 DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id
 LDAP_BIND_USER = CONF.ldap.user
 LDAP_BIND_PASSWORD = CONF.ldap.password