diff --git a/common/src/main/java/com/mfsys/common/configuration/filter/LoggingFilter.java b/common/src/main/java/com/mfsys/common/configuration/filter/LoggingFilter.java
index fd2e2f8..eb21635 100644
--- a/common/src/main/java/com/mfsys/common/configuration/filter/LoggingFilter.java
+++ b/common/src/main/java/com/mfsys/common/configuration/filter/LoggingFilter.java
@@ -59,10 +59,15 @@ public class LoggingFilter extends OncePerRequestFilter {
             log.setResponseCode(response.getStatus());
 
             // Try to extract userId from header or session
-            String userId = request.getHeader("X-USER-ID");
+            String userId = request.getHeader("userId");
+            if ((userId == null || userId.isEmpty()) && request.getHeader("X-USER-ID") != null) {
+                userId = request.getHeader("X-USER-ID");
+            }
+
             if (userId == null || userId.isEmpty()) {
-                userId = "ANONYMOUS";
+                userId = "NA";
             }
+
             log.setUserId(userId);
 
             loggerRepo.save(log);