diff --git a/management/univention-management-console-module-adtakeover/umc/python/adtakeover/takeover.py b/management/univention-management-console-module-adtakeover/umc/python/adtakeover/takeover.py
index 9439795ad3..b3233c2dd4 100644
--- a/management/univention-management-console-module-adtakeover/umc/python/adtakeover/takeover.py
+++ b/management/univention-management-console-module-adtakeover/umc/python/adtakeover/takeover.py
@@ -1359,8 +1359,8 @@ class AD_Takeover():
 				self.samdb.modify(delta)
 
 	def resync_s4connector_listener(self, progress):
-		log.info("Waiting for listener to finish (max. 180 seconds)")
-		if not wait_for_listener_replication(progress, 180):
+		log.info("Waiting for listener to finish (max. 10 minutes)")
+		if not wait_for_listener_replication(progress, 600):
 			log.warn("Warning: Stopping Listener now anyway.")
 
 		# Restart Univention Directory Listener for S4 Connector
@@ -2104,7 +2104,7 @@ def wait_for_listener_replication(progress=None, max_time=None):
 	notifier_id_cached_value = None
 	static_count = 0
 	t_last_feedback = t_1 = t_0 = time.time()
-	while static_count < 3:
+	while static_count < 5:
 		if notifier_id_cached_value:
 			time.sleep(0.7)
 		last_id = get_stable_last_id(progress)
@@ -2127,7 +2127,7 @@ def wait_for_listener_replication(progress=None, max_time=None):
 		delta_t_last_feedback = t_1 - t_last_feedback
 		if progress and delta_t_last_feedback >= 1:
 			t_last_feedback = t_last_feedback + delta_t_last_feedback
-			progress.percentage_increment_scaled(1.0 / 32)
+			progress.percentage_increment_scaled(0.6 / 32)
 
 	return True
 
@@ -2247,7 +2247,7 @@ class UserRenameHandler:
 		try:
 			log.debug("Renaming '%s' to '%s' in UCS LDAP." % (user.dn, new_name))
 			user['username'] = new_name
-			return user.modify()
+			user.modify()
 		except uexceptions.ldapError as exc:
 			log.debug("Renaming of user '%s' failed: %s." % (userdn, exc,))
 			return