diff --git a/internal/middleware/grpc/auth.go b/internal/middleware/grpc/auth.go
index 68926d7..0c85176 100644
--- a/internal/middleware/grpc/auth.go
+++ b/internal/middleware/grpc/auth.go
@@ -19,7 +19,7 @@ func JwtAuth(ctx context.Context) (context.Context, error) {
 	}
 
 	sub := consts.AnonymousUser
-	var jwtIdToken = &models.User{}
+	var jwtIdToken = models.User{}
 
 	if config.DebugMode.Enable {
 		jwtIdToken.Token.Sub = sub
@@ -45,14 +45,14 @@ func JwtAuth(ctx context.Context) (context.Context, error) {
 
 		jwtIdToken.Valid = true
 
-		err = mapstructure.Decode(token.Claims, &jwtIdToken)
+		err = mapstructure.Decode(token.Claims, &jwtIdToken.Token)
 		if err != nil {
 			logger.Error("Failed to map token claims to JwtIDToken struct.\nError: " + err.Error())
 			return nil, err
 		}
 	}
 
-	ctx = logging.InjectFields(ctx, logging.Fields{"auth.sub", sub})
+	ctx = logging.InjectFields(ctx, logging.Fields{consts.AuthMiddlewareKey, sub})
 
-	return context.WithValue(ctx, "auth", jwtIdToken), nil
+	return context.WithValue(ctx, consts.AuthMiddlewareKey, &jwtIdToken), nil
 }