diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/event/MfaAuthenticationFailureEvent.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/event/MfaAuthenticationFailureEvent.java
index 40214af887f..e3cf4365d7c 100644
--- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/event/MfaAuthenticationFailureEvent.java
+++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/event/MfaAuthenticationFailureEvent.java
@@ -20,7 +20,7 @@ public MfaAuthenticationFailureEvent(UaaUser user, Authentication authentication
     public AuditEvent getAuditEvent() {
         Assert.notNull(user, "UaaUser cannot be null");
         return createAuditRecord(user.getId(), AuditEventType.MfaAuthenticationFailure,
-                getOrigin(getAuthenticationDetails()) + ", type=" + type, user.getUsername());
+                getOrigin(getAuthenticationDetails()), user.getUsername(), type, null);
     }
 
     public UaaUser getUser() {
diff --git a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/event/MfaAuthenticationSuccessEvent.java b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/event/MfaAuthenticationSuccessEvent.java
index f7390901260..1f929591af2 100644
--- a/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/event/MfaAuthenticationSuccessEvent.java
+++ b/server/src/main/java/org/cloudfoundry/identity/uaa/authentication/event/MfaAuthenticationSuccessEvent.java
@@ -20,7 +20,7 @@ public MfaAuthenticationSuccessEvent(UaaUser user, Authentication authentication
     public AuditEvent getAuditEvent() {
         Assert.notNull(user, "UaaUser cannot be null");
         return createAuditRecord(user.getId(), AuditEventType.MfaAuthenticationSuccess,
-                getOrigin(getAuthenticationDetails()) + ", type=" + type, user.getUsername());
+                getOrigin(getAuthenticationDetails()), user.getUsername(), type, null);
     }
 
     public UaaUser getUser() {