diff --git a/logs/api-logs.go b/logs/api-logs.go
index 4245894c781391c56e4b40cdaa31c2bc26cea983..f1e2af38af9641952df6c1918d8bc7be29120b87 100644
--- a/logs/api-logs.go
+++ b/logs/api-logs.go
@@ -65,7 +65,7 @@ func LogIncomingAPIRequest(startTime time.Time, requestID string, claim map[stri
 		}
 	}
 
-	username, _ := claim["Username"].(string)
+	userID, _ := claim["UserID"].(int64)
 	accountID, _ := claim["AccountID"].(int64)
 	if accountID == 0 {
 		if accountIDParam, ok := req.QueryStringParameters["account_id"]; ok {
@@ -88,7 +88,7 @@ func LogIncomingAPIRequest(startTime time.Time, requestID string, claim map[stri
 		InitialAuthUsername: authUsername,
 		SourceIP:            req.RequestContext.Identity.SourceIP,
 		UserAgent:           req.RequestContext.Identity.UserAgent,
-		Username:            username,
+		UserID:              userID,
 		AccountID:           accountID,
 		Request: ApiLogRequest{
 			Headers:         req.Headers,
@@ -148,7 +148,7 @@ func LogOutgoingAPIRequest(startTime time.Time, requestID string, claim map[stri
 	//logger.Debugf("claim: %+v", claim)
 
 	endTime := time.Now()
-	username, _ := claim["Username"].(string)
+	userID, _ := claim["UserID"].(int64)
 	accountID, _ := claim["AccountID"].(int64)
 	params := map[string]string{}
 	parsedURL, err := url.Parse(urlString)
@@ -168,7 +168,7 @@ func LogOutgoingAPIRequest(startTime time.Time, requestID string, claim map[stri
 		Address:      parsedURL.Host,
 		ResponseCode: responseCode,
 		RequestID:    requestID,
-		Username:     username,
+		UserID:       userID,
 		AccountID:    accountID,
 		Request: ApiLogRequest{
 			//Headers:         req.Headers,
@@ -218,7 +218,7 @@ type ApiLog struct {
 	InitialAuthUsername string         `json:"initial_auth_username,omitempty"`
 	InitialAuthType     string         `json:"initial_auth_type,omitempty"`
 	AccountID           int64          `json:"account_id,omitempty"`
-	Username            string         `json:"username,omitempty"`
+	UserID              int64          `json:"user_id,omitempty"`
 	SourceIP            string         `json:"source_ip,omitempty"`  //only logged for incoming API
 	UserAgent           string         `json:"user_agent,omitempty"` //only for incoming, indicate type of browser when UI
 	RelevantID          string         `json:"relevant_id,omitempty"`