diff --git a/ucs-3.2-8/management/univention-management-console-module-udm/umc/python/udm/__init__.py b/ucs-3.2-8/management/univention-management-console-module-udm/umc/python/udm/__init__.py
index 20728ba..1b01b07 100644
--- a/ucs-3.2-8/management/univention-management-console-module-udm/umc/python/udm/__init__.py
+++ b/ucs-3.2-8/management/univention-management-console-module-udm/umc/python/udm/__init__.py
@@ -474,7 +474,10 @@ def _thread( request ):
 										  notifier.Callback( self._thread_finished, request ) )
 		thread.run()
 
-	@sanitize(objectPropertyValue=LDAPSearchSanitizer())
+	@sanitize(objectPropertyValue=LDAPSearchSanitizer(
+		add_asterisks=ucr.is_true('umc/auto_substring_search', True),
+		use_asterisks=ucr.is_true('umc/allow_substring_search', True),
+	))
 	def query( self, request ):
 		"""Searches for LDAP objects and returns a few properties of the found objects