Index: umc/python/diagnostic/plugins/check_server_password.py
===================================================================
--- umc/python/diagnostic/plugins/check_server_password.py	(Revision 82483)
+++ umc/python/diagnostic/plugins/check_server_password.py	(Arbeitskopie)
@@ -103,7 +103,7 @@
 
 def change_server_password(configRegistry):
 	interval = configRegistry.get('server/password/interval', '21')
-	ucr_set('server/password/interval=-1')
+	ucr_set(['server/password/interval=-1'])
 	try:
 		subprocess.check_call(['/usr/lib/univention-server/server_password_change'])
 	except subprocess.CalledProcessError:
@@ -113,12 +113,12 @@
 		]
 		raise Critical(description=' '.join(error_descriptions))
 	finally:
-		ucr_set('server/password/interval={}'.format(interval))
+		ucr_set(['server/password/interval={}'.format(interval)])
 
 
 def restore_machine_password(role, ldap_connection):
 	with open('/etc/machine.secret') as fob:
-		password = fob.read().rstrip('\n')
+		password = fob.read()
 
 	if not password:
 		password = univention.lib.misc.createMachinePassword()