Index: debian/changelog
===================================================================
--- debian/changelog	(Revision 60766)
+++ debian/changelog	(Arbeitskopie)
@@ -1,3 +1,10 @@
+univention-s4-connector (9.0.16-18) unstable; urgency=medium
+
+  * Reset lockout values (badPwdCount, badPasswordTime, lockoutTime)
+    while changeing the password via UMC (Bug #37416)
+
+ -- Stefan Gohmann <gohmann@univention.de>  Tue, 19 May 2015 06:18:23 +0200
+
 univention-s4-connector (9.0.16-17) unstable; urgency=low
 
   * Bug #28331: removed pwdComplexity UDM default from join script 
Index: modules/univention/s4connector/s4/password.py
===================================================================
--- modules/univention/s4connector/s4/password.py	(Revision 60766)
+++ modules/univention/s4connector/s4/password.py	(Arbeitskopie)
@@ -619,6 +619,9 @@
 				newpwdlastset = str(univention.s4connector.s4.samba2s4_time(sambaPwdLastSet))
 		ud.debug(ud.LDAP, ud.INFO, "password_sync_ucs_to_s4: pwdlastset in modlist: %s" % newpwdlastset)
 		modlist.append((ldap.MOD_REPLACE, 'pwdlastset', newpwdlastset))
+		modlist.append((ldap.MOD_REPLACE, 'badPwdCount', '0'))
+		modlist.append((ldap.MOD_REPLACE, 'badPasswordTime', '0'))
+		modlist.append((ldap.MOD_REPLACE, 'lockoutTime', '0'))
 
 	else:
 		ud.debug(ud.LDAP, ud.INFO, "password_sync_ucs_to_s4: No password change to sync to S4 ")