--- /etc/univention/connector/ad/mapping        2016-05-11 22:30:19.060000000 +0200
+++ /etc/univention/connector/ad/mapping.mod    2016-05-11 22:30:43.236000000 +0200
@@ -365,10 +365,19 @@
        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', False):
+        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,
+@!@
+if baseConfig.is_false('connector/ad/mapping/computer/password/disabled', False):
+       print """                               univention.connector.ad.password.password_sync,"""
+@!@
                                                ],

                        scope='sub',