diff --git a/src/oidcserver.js b/src/oidcserver.js
index 579f144e5..cd8ca3ceb 100644
--- a/src/oidcserver.js
+++ b/src/oidcserver.js
@@ -467,7 +467,7 @@ async function interactionConfirm(req, res, next) {
     const userAgent = req.headers['user-agent'] || '';
     const auditSource = AuditSource.fromOidcRequest(req);
 
-    await eventlog.add(user.ghost ? eventlog.ACTION_USER_LOGIN_GHOST : eventlog.ACTION_USER_LOGIN, auditSource, { userId: user.id, user: users.removePrivateFields(user), appId: params.client_id });
+    await eventlog.add(user.ghost ? eventlog.ACTION_USER_LOGIN_GHOST : eventlog.ACTION_USER_LOGIN, auditSource, { userId: user.id, user: users.removePrivateFields(user), appId: client.appId || null });
     await users.notifyLoginLocation(user, ip, userAgent, auditSource);
 
     const result = { consent };