@@ -, +, @@ 
    Bug #50305: do not use normalise_userAccountControl() anymore.
--- a/services/univention-s4-connector/conffiles/etc/univention/s4connector/s4/mapping.py	
+++ a/services/univention-s4-connector/conffiles/etc/univention/s4connector/s4/mapping.py	
@@ -195,9 +195,7 @@ s4_mapping = {
 			univention.s4connector.set_primary_group_user,
 			univention.s4connector.s4.sid_mapping.sid_to_ucs if configRegistry.is_true('connector/s4/mapping/sid_to_ucs', True) and not configRegistry.is_true('connector/s4/mapping/sid', True) else None,
 		]),
-		post_con_create_functions=[
-			univention.s4connector.s4.normalise_userAccountControl,
-		],
+		con_create_attributes=[('userAccountControl', ['512'])],
 		post_con_modify_functions=filter(None, [
 			univention.s4connector.s4.sid_mapping.sid_to_s4 if configRegistry.is_true('connector/s4/mapping/sid_to_s4', False) and not configRegistry.is_true('connector/s4/mapping/sid', True) else None,
 			univention.s4connector.s4.password.password_sync_ucs_to_s4,
--- a/services/univention-s4-connector/modules/univention/s4connector/s4/__init__.py	
+++ a/services/univention-s4-connector/modules/univention/s4connector/s4/__init__.py	
@@ -41,6 +41,7 @@ import sys
 import time
 import types
 import pprint
+import warnings
 
 import ldap
 from ldap.controls import LDAPControl
@@ -67,6 +68,7 @@ PAGE_SIZE = 1000
 
 
 def normalise_userAccountControl(s4connector, key, object):
+	warnings.warn('The function normalise_userAccountControl() is deprecated and should not be used in the mapping anymore. Use con_create_attributes instead.')
 	# set userAccountControl to 512 -- accounts synced to samba4 alpha17 had userAccountControl == 544
 	ud.debug(ud.LDAP, ud.ALL, "normalise_userAccountControl: dn: %s" % object['dn'])
 	for i in range(0, 10):