--- debian/changelog	(Revision 55446)
+++ debian/changelog	(Arbeitskopie)
@@ -1,3 +1,10 @@ 
+univention-management-console (7.1.62-1) UNRELEASED; urgency=medium
+
+  * Bug #35985: Fix case where posix authentication still works (not locked)
+    but acct_mgmt fails because something is expired.
+
+ -- Arvid Requate <requate@univention.de>  Thu, 06 Nov 2014 13:05:14 +0100
+
 univention-management-console (7.1.61-1) unstable; urgency=medium
 
   * Bug #32818: improved connection handling
--- src/univention/management/console/pam.py	(Revision 55446)
+++ src/univention/management/console/pam.py	(Arbeitskopie)
@@ -122,6 +122,7 @@ 
 
 		try:
 			pam.authenticate()
+			self._validate_account(pam)
 		except PAMError as pam_err:
 			AUTH.error("PAM: authentication error: %s" % (pam_err,))
 
@@ -129,10 +130,9 @@ 
 				self._validate_account(pam)
 
 			raise AuthenticationFailed(self.error_message(pam_err))
-		self.__workaround_pw_expired = False
+		else:
+			self.__workaround_pw_expired = False
 
-		self._validate_account(pam)
-
 	def _validate_account(self, pam):
 		try:
 			pam.acct_mgmt()