Index: conffiles/etc/univention/s4connector/s4/mapping.py
===================================================================
--- conffiles/etc/univention/s4connector/s4/mapping.py	(Revision 75940)
+++ conffiles/etc/univention/s4connector/s4/mapping.py	(Arbeitskopie)
@@ -659,15 +659,17 @@
 	for gpo in configRegistry.get('connector/s4/mapping/gpo/ignorelist', '').split(','):
 		if gpo:
 			ignore_filter += '(cn=%s)' % (gpo)
-	if configRegistry.get('connector/s4/mapping/ou/syncmode'):
-		sync_mode_ou=configRegistry.get('connector/s4/mapping/ou/syncmode')
+	if configRegistry.get('connector/s4/mapping/gpo/syncmode'):
+		sync_mode_gpo=configRegistry.get('connector/s4/mapping/gpo/syncmode')
+	elif configRegistry.get('connector/s4/mapping/ou/syncmode'):
+		sync_mode_gpo=configRegistry.get('connector/s4/mapping/ou/syncmode')
 	else:
-		sync_mode_ou=configRegistry.get('connector/s4/mapping/syncmode')
+		sync_mode_gpo=configRegistry.get('connector/s4/mapping/syncmode')
 	section = '''
 	'msGPO': univention.s4connector.property (
 			ucs_module='container/msgpo',
 
-			sync_mode='%(sync_mode_ou)s',
+			sync_mode='%(sync_mode_gpo)s',
 
 			scope='sub',