--- /etc/univention/connector/ad/mapping        2016-05-11 22:12:00.100000000 +0200
+++ /etc/univention/connector/ad/mapping.mod    2016-05-11 22:12:20.396000000 +0200
@@ -365,12 +365,18 @@
        print "sync_mode='%s'," % configRegistry.get('connector/ad/mapping/computer/syncmode')
 else:
        print "sync_mode='%s'," % configRegistry.get('connector/ad/mapping/syncmode')
-@!@
+if baseConfig.is_false('connector/ad/mapping/computer/password/disabled', True):
+        print """
+                       post_con_modify_functions=[
+                               univention.connector.ad.password.password_sync_ucs,
+                                               ],

                        post_ucs_modify_functions=[
-                                                   univention.connector.ad.set_univentionObjectFlag_to_synced,
+                               univention.connector.ad.set_univentionObjectFlag_to_synced,
+                               univention.connector.ad.password.password_sync,
                                                ],
-
+               """
+@!@
                        scope='sub',

                        dn_mapping_function=[ univention.connector.ad.windowscomputer_dn_mapping ],