diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index fa8075e3e8bca64b8bf6942851768c73a5295630..40403bb834099c6e7d456c4888552831b3a1b4e9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -14,6 +14,11 @@ Added
 
 * Add Ukrainian locale (contributed by Sergiy Gorichenko from Fre(i)e Software GmbH).
 
+Fixed
+~~~~~
+
+* Remove preferences for the not yet available functionality to create LDAP users on register.
+
 `2.1`_ - 2022-01-21
 -------------------
 
diff --git a/aleksis/apps/ldap/preferences.py b/aleksis/apps/ldap/preferences.py
index 229f0a171a9cd792bc86c641f78b88caf11f8277..9a85f53be92b45308706c22e96e99162fecc00a0 100644
--- a/aleksis/apps/ldap/preferences.py
+++ b/aleksis/apps/ldap/preferences.py
@@ -35,22 +35,22 @@ class LDAPPersonSyncOnLogin(BooleanPreference):
     verbose_name = _("Sync LDAP user with person on login")
 
 
-@site_preferences_registry.register
-class LDAPUserCreateOnRegister(BooleanPreference):
-    section = ldap
-    name = "user_create_on_register"
-    default = True
-    required = False
-    verbose_name = _("Create LDAP user on registration")
-
-
-@site_preferences_registry.register
-class LDAPUserCreateRDNFields(StringPreference):
-    section = ldap
-    name = "user_create_rdn_fields"
-    default = "uid"
-    required = False
-    verbose_name = _("Comma-separated list of RDN fields for new user entries")
+# @site_preferences_registry.register
+# class LDAPUserCreateOnRegister(BooleanPreference):
+#    section = ldap
+#    name = "user_create_on_register"
+#    default = True
+#    required = False
+#    verbose_name = _("Create LDAP user on registration")
+
+
+# @site_preferences_registry.register
+# class LDAPUserCreateRDNFields(StringPreference):
+#    section = ldap
+#    name = "user_create_rdn_fields"
+#    default = "uid"
+#    required = False
+#    verbose_name = _("Comma-separated list of RDN fields for new user entries")
 
 
 @site_preferences_registry.register