diff --git a/auth/webauthn/webauthn.go b/auth/webauthn/webauthn.go
index 19dc5e86..c27274e9 100644
--- a/auth/webauthn/webauthn.go
+++ b/auth/webauthn/webauthn.go
@@ -236,6 +236,10 @@ func (wa *webAuthnService) FinishRegistration(ctx context.Context, opts *FinishR
 		return fmt.Errorf("ERR_WEBAUTHN_ADD_CREDENTIAL: %w", err)
 	}
 
+	if err = wa.store.RemoveWebAuthSessionData(ctx, opts.User.ID); err != nil {
+		return fmt.Errorf("ERR_WEBAUTHN_ADD_CREDENTIAL: RemoveWebAuthSessionData: %w", err)
+	}
+
 	return nil
 }
 
@@ -306,5 +310,9 @@ func (wa *webAuthnService) FinishLogin(ctx context.Context, opts *FinishLoginOpt
 		return fmt.Errorf("ERR_VALIDATE_WEBAUTHN_LOGIN: %w", err)
 	}
 
+	if err = wa.store.RemoveWebAuthSessionData(ctx, opts.User.ID); err != nil {
+		return fmt.Errorf("ERR_WEBAUTHN_ADD_CREDENTIAL: RemoveWebAuthSessionData: %w", err)
+	}
+
 	return nil
 }
diff --git a/services/yor/clair/v1/server/interceptors.go b/services/yor/clair/v1/server/interceptors.go
index 3e08bbdb..64da34bb 100644
--- a/services/yor/clair/v1/server/interceptors.go
+++ b/services/yor/clair/v1/server/interceptors.go
@@ -24,12 +24,13 @@ func (c *clair) NewJWTInterceptor() connect.UnaryInterceptorFunc {
 
 			userID, err := c.getTokenFromReq(req, c.authConfig.JWTSigningPubKey)
 			if err != nil {
+				logEvent.Err(err).Send()
 				return nil, err
 			}
 
 			user, err := c.userGetter.GetUserByID(ctx, userID)
 			if err != nil {
-				logEvent.Str("error", err.Error()).Send()
+				logEvent.Err(err).Send()
 				return nil, connect.NewError(connect.CodeFailedPrecondition, err)
 			}