--- umc/python/passwordreset/__init__.py.baaaak	2020-05-09 17:16:09.540720269 +0200
+++ umc/python/passwordreset/__init__.py.bak	2020-05-09 17:12:53.421763280 +0200
@@ -825,7 +825,7 @@
 			MODULE.error("Found token in DB for blacklisted user '{}'.".format(username))
 			self.db.delete_tokens(token=token, username=username)
 			raise ServiceForbidden()  # TokenNotFound() ?
-		ret = self.udm_set_password(username, password)
+		ret = self.udm_set_password(username, password, enable=True)
 		self.db.delete_tokens(token=token, username=username)
 		if ret:
 			raise UMC_Error(_("Successfully changed your password."), status=200)
@@ -1035,13 +1035,15 @@
 			return False
 		return True
 
-	def udm_set_password(self, username, password):
+	def udm_set_password(self, username, password, enable=False):
 		user = self.get_udm_user(username=username, admin=True)
 		if ucr.is_true('ad/member') and 'synced' in user.get('objectFlag', []):
 			return self.admember_set_password(username, password)
 		try:
 			user["password"] = password
 			user["pwdChangeNextLogin"] = 0
+			if enable:
+				user["disabled"] = 0
 			user.modify()
 			return True
 		except (udm_errors.pwToShort, udm_errors.pwQuality) as exc: