diff -Naur /etc/univention/connector/ad/mapping.orig /etc/univention/connector/ad/mapping
--- /etc/univention/connector/ad/mapping.orig   2016-10-10 12:05:30.918297634 +0200
+++ /etc/univention/connector/ad/mapping        2016-10-10 12:18:07.150335876 +0200
@@ -202,26 +202,36 @@
                                                        ldap_attribute='postalCode',
                                                        con_attribute='postalCode',
                                                ),
-                                       'sambaWorkstations': univention.connector.attribute (
+@!@
+if configRegistry.is_true('connector/ad/mapping/user/sambaWorkstations', True):
+       print """                                       'sambaWorkstations': univention.connector.attribute (
                                                        ucs_attribute='sambaUserWorkstations',
                                                        ldap_attribute='sambaUserWorkstations',
                                                        con_attribute='userWorkstations',
                                                ),
+                                               """
+@!@
                                        #'sambaLogonHours': univention.connector.attribute (
                                        #               ucs_attribute='sambaLogonHours',
                                        #               ldap_attribute='sambaLogonHours',
                                        #               con_attribute='logonHours',
                                        #       ),
-                                       'profilepath': univention.connector.attribute (
+@!@
+if configRegistry.is_true('connector/ad/mapping/user/profilepath', True):
+       print """                                       'profilepath': univention.connector.attribute (
                                                        ucs_attribute='profilepath',
                                                        ldap_attribute='sambaProfilePath',
                                                        con_attribute='profilePath',
                                                ),
-                                       'scriptpath': univention.connector.attribute (
+                                               """
+if configRegistry.is_true('connector/ad/mapping/user/scriptpath', True):
+       print """                                       'scriptpath': univention.connector.attribute (
                                                        ucs_attribute='scriptpath',
                                                        ldap_attribute='sambaLogonScript',
                                                        con_attribute='scriptPath',
                                                ),
+                                               """
+@!@
                                        'telephoneNumber': univention.connector.attribute (
                                                        ucs_attribute='phone',
                                                        ldap_attribute='telephoneNumber',