diff --git a/swagger-meta/src/main/java/com/networknt/swagger/SwaggerOperation.java b/swagger-meta/src/main/java/com/networknt/swagger/SwaggerOperation.java
index 7a90ae84..232105da 100644
--- a/swagger-meta/src/main/java/com/networknt/swagger/SwaggerOperation.java
+++ b/swagger-meta/src/main/java/com/networknt/swagger/SwaggerOperation.java
@@ -35,8 +35,6 @@ public class SwaggerOperation {
     private final Path pathObject;
     private final HttpMethod method;
     private final Operation operation;
-    private String endpoint;
-    private String clientId;
 
     public SwaggerOperation(final NormalisedPath pathString, final Path pathObject,
                             final HttpMethod method, final Operation operation) {
@@ -75,19 +73,4 @@ public Operation getOperation() {
         return operation;
     }
 
-    public String getEndpoint() {
-        return endpoint;
-    }
-
-    public void setEndpoint(String endpoint) {
-        this.endpoint = endpoint;
-    }
-
-    public String getClientId() {
-        return clientId;
-    }
-
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
 }
diff --git a/swagger-security/src/main/java/com/networknt/security/JwtVerifyHandler.java b/swagger-security/src/main/java/com/networknt/security/JwtVerifyHandler.java
index 594fc622..a68c9768 100644
--- a/swagger-security/src/main/java/com/networknt/security/JwtVerifyHandler.java
+++ b/swagger-security/src/main/java/com/networknt/security/JwtVerifyHandler.java
@@ -83,10 +83,10 @@ public void handleRequest(final HttpServerExchange exchange) throws Exception {
                 // endpoint and swaggerOperation available. This handler will enrich the auditInfo.
                 if(auditInfo == null) {
                     auditInfo = new HashMap<>();
-                    auditInfo.put(Constants.CLIENT_ID, claims.getStringClaimValue(Constants.CLIENT_ID));
-                    auditInfo.put(Constants.USER_ID, claims.getStringClaimValue(Constants.USER_ID));
                     exchange.putAttachment(AuditHandler.AUDIT_INFO, auditInfo);
                 }
+                auditInfo.put(Constants.CLIENT_ID, claims.getStringClaimValue(Constants.CLIENT_ID));
+                auditInfo.put(Constants.USER_ID, claims.getStringClaimValue(Constants.USER_ID));
                 if(config != null && (Boolean)config.get(ENABLE_VERIFY_SCOPE) && SwaggerHelper.swagger != null) {
                     Operation operation = null;
                     SwaggerOperation swaggerOperation = (SwaggerOperation)auditInfo.get(Constants.SWAGGER_OPERATION);