diff --git a/orcid-web/src/main/java/org/orcid/frontend/oauth2/OauthController.java b/orcid-web/src/main/java/org/orcid/frontend/oauth2/OauthController.java
index f11d4ef4f55..a544d63b92f 100644
--- a/orcid-web/src/main/java/org/orcid/frontend/oauth2/OauthController.java
+++ b/orcid-web/src/main/java/org/orcid/frontend/oauth2/OauthController.java
@@ -97,7 +97,7 @@ public class OauthController {
             if (responseParam != null && !responseParam.isEmpty() && !PojoUtil.isEmpty(responseParam.get(0))) {
                 isResponseSet = true;
                 if (Features.EVENTS.isActive()) {
-                    eventManager.createEvent(requestInfoForm.getUserOrcid(), EventType.REAUTHORIZE, request);
+                    eventManager.createEvent(EventType.REAUTHORIZE, request);
                 }
             }
         }
diff --git a/orcid-web/src/main/java/org/orcid/frontend/spring/AjaxAuthenticationSuccessHandler.java b/orcid-web/src/main/java/org/orcid/frontend/spring/AjaxAuthenticationSuccessHandler.java
index 6bb187adfbb..599baf46329 100644
--- a/orcid-web/src/main/java/org/orcid/frontend/spring/AjaxAuthenticationSuccessHandler.java
+++ b/orcid-web/src/main/java/org/orcid/frontend/spring/AjaxAuthenticationSuccessHandler.java
@@ -26,7 +26,7 @@ public class AjaxAuthenticationSuccessHandler extends AjaxAuthenticationSuccessH
     public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
     	String targetUrl = getTargetUrl(request, response, authentication);
         if (Features.EVENTS.isActive()) {
-            eventManager.createEvent(authentication.getPrincipal().toString(), EventType.SIGN_IN, request);
+            eventManager.createEvent(EventType.SIGN_IN, request);
         }
         response.setContentType("application/json");
         response.getWriter().println("{\"success\": true, \"url\": \"" + targetUrl.replaceAll("^/", "") + "\"}");        
diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/OauthAuthorizeController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/OauthAuthorizeController.java
index 1858acb7338..d1f258b4550 100644
--- a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/OauthAuthorizeController.java
+++ b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/OauthAuthorizeController.java
@@ -276,7 +276,7 @@ public ModelAndView loginGetHandler(HttpServletRequest request, HttpServletRespo
             } else {
                 orcid = auth.getPrincipal().toString();
             }
-            eventManager.createEvent(orcid, eventType, request);
+            eventManager.createEvent(eventType, request);
         }
         if(new HttpSessionRequestCache().getRequest(request, response) != null)
             new HttpSessionRequestCache().removeRequest(request, response);
diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/PublicRecordController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/PublicRecordController.java
index 3f2f78febc4..b4f8ab05aa4 100644
--- a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/PublicRecordController.java
+++ b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/PublicRecordController.java
@@ -185,7 +185,7 @@ PublicRecord getPublicRecord(@PathVariable("orcid") String orcid) {
 
         try {
             if (Features.EVENTS.isActive()) {
-                eventManager.createEvent(orcid, EventType.PUBLIC_PAGE, null);
+                eventManager.createEvent(EventType.PUBLIC_PAGE, null);
             }
             // Check if the profile is deprecated or locked
             orcidSecurityManager.checkProfile(orcid);
diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/RegistrationController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/RegistrationController.java
index 9979dfd533f..a3e86e1fce9 100644
--- a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/RegistrationController.java
+++ b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/RegistrationController.java
@@ -282,7 +282,7 @@ public void validateGrcaptcha(HttpServletRequest request, @RequestBody Registrat
             // Ip
             String ip = OrcidRequestUtil.getIpAddress(request);
             if (Features.EVENTS.isActive()) {
-                eventManager.createEvent(getCurrentUserOrcid(), EventType.NEW_REGISTRATION, request);
+                eventManager.createEvent(EventType.NEW_REGISTRATION, request);
             }
             createMinimalRegistrationAndLogUserIn(request, response, reg, usedCaptcha, locale, ip);
         } catch (Exception e) {
diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/ShibbolethController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/ShibbolethController.java
index 9f0dc458c06..818670ab8f6 100644
--- a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/ShibbolethController.java
+++ b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/ShibbolethController.java
@@ -173,7 +173,7 @@ public ModelAndView signinHandler(HttpServletRequest request, HttpServletRespons
                 processAuthentication(remoteUser, userConnectionEntity);
                 if (Features.EVENTS.isActive()) {
                     OrcidProfileUserDetails orcidProfileUserDetails = getOrcidProfileUserDetails(userConnectionEntity.getOrcid());
-                    eventManager.createEvent(orcidProfileUserDetails.getOrcid(), EventType.SIGN_IN, request);
+                    eventManager.createEvent(EventType.SIGN_IN, request);
                 }
             } catch (AuthenticationException e) {
                 // this should never happen