diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/audit/JdbcUnsuccessfulLoginCountingAuditService.java b/server/src/main/java/org/cloudfoundry/identity/uaa/audit/JdbcUnsuccessfulLoginCountingAuditService.java
index 689fd873954..4a674151054 100644
--- a/server/src/main/java/org/cloudfoundry/identity/uaa/audit/JdbcUnsuccessfulLoginCountingAuditService.java
+++ b/server/src/main/java/org/cloudfoundry/identity/uaa/audit/JdbcUnsuccessfulLoginCountingAuditService.java
@@ -39,11 +39,7 @@ public JdbcUnsuccessfulLoginCountingAuditService(
     @Override
     public void log(AuditEvent auditEvent, String zoneId) {
         switch (auditEvent.getType()) {
-            case UserAuthenticationSuccess:
-            case PasswordChangeSuccess:
-                resetAuthenticationEvents(auditEvent, zoneId, UserAuthenticationFailure);
-                break;
-            case UserAccountUnlockedEvent:
+            case UserAuthenticationSuccess, PasswordChangeSuccess, UserAccountUnlockedEvent:
                 resetAuthenticationEvents(auditEvent, zoneId, UserAuthenticationFailure);
                 break;
             case UserAuthenticationFailure: