diff --git a/openam-core/src/main/java/com/sun/identity/common/ISAccountLockout.java b/openam-core/src/main/java/com/sun/identity/common/ISAccountLockout.java
index 2406444294..3513e08ec9 100644
--- a/openam-core/src/main/java/com/sun/identity/common/ISAccountLockout.java
+++ b/openam-core/src/main/java/com/sun/identity/common/ISAccountLockout.java
@@ -230,6 +230,9 @@ public int invalidPasswd(String userDN, String userName,
         if (((lastFailTime + failureLockoutTime) > now) &&
             (fail_count >= failureLockoutCount)
         ) {
+            if(lockedAt > 0 && failureLockoutMultiplier > 0) { //if was previously locked, multiply duration
+                acInfo.setActualLockoutDuration(acInfo.getActualLockoutDuration() * failureLockoutMultiplier);
+            }
             lockedAt = now;
         }
         if (debug.messageEnabled()) {