Index: univention-directory-manager-modules/modules/univention/admin/handlers/computers/windows.py
===================================================================
--- univention-directory-manager-modules/modules/univention/admin/handlers/computers/windows.py	(Revision 41647)
+++ univention-directory-manager-modules/modules/univention/admin/handlers/computers/windows.py	(Arbeitskopie)
@@ -480,7 +480,7 @@
 			if 'posix' in self.options:
 				password_crypt = "{crypt}%s" % (univention.admin.password.crypt(self['password']))
 				al.append(('userPassword', self.oldattr.get('userPassword', [''])[0], password_crypt))
-			if 'samba' in self.options:
+			if 'samba' in self.options and self['ntCompatibility'] != '1':
 				password_nt, password_lm = univention.admin.password.ntlm(self['password'])
 				al.append(('sambaNTPassword', self.oldattr.get('sambaNTPassword', [''])[0], password_nt))
 				al.append(('sambaLMPassword', self.oldattr.get('sambaLMPassword', [''])[0], password_lm))