diff --git a/internal/config/config.go b/internal/config/config.go
index cd09819..77a4f93 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -76,8 +76,8 @@ type Config struct {
 	AuthJwtSecret                   string
 	AuthJwtClaimUsername            string
 	AuthJwtClaimUserGroup           string
-	AuthHttpHeaderUsername 			string
-	AuthHttpHeaderUserGroup 		string
+	AuthHttpHeaderUsername          string
+	AuthHttpHeaderUserGroup         string
 	DefaultPermissions              PermissionsList
 	AccessControlLists              []AccessControlList
 }
diff --git a/internal/httpservers/restapi.go b/internal/httpservers/restapi.go
index f8f2fbf..07d9327 100644
--- a/internal/httpservers/restapi.go
+++ b/internal/httpservers/restapi.go
@@ -72,9 +72,7 @@ func startRestAPIServer(globalConfig *config.Config) error {
 
 	// The JSONPb.EmitDefaults is necssary, so "empty" fields are returned in JSON.
 	mux := runtime.NewServeMux(
-		runtime.WithMetadata(func(ctx context.Context, request *http.Request) metadata.MD {
-			return parseRequestMetadata(ctx, request)
-		}),
+		runtime.WithMetadata(parseRequestMetadata),
 		runtime.WithMarshalerOption(runtime.MIMEWildcard, &runtime.HTTPBodyMarshaler{
 			Marshaler: &runtime.JSONPb{
 				MarshalOptions: protojson.MarshalOptions{
diff --git a/internal/httpservers/restapi_auth_jwt.go b/internal/httpservers/restapi_auth_jwt.go
index 5a6baf4..4441310 100644
--- a/internal/httpservers/restapi_auth_jwt.go
+++ b/internal/httpservers/restapi_auth_jwt.go
@@ -1,10 +1,10 @@
-package httpservers;
+package httpservers
 
 import (
-	"github.com/golang-jwt/jwt/v4"
-	"fmt"
-	log "github.com/sirupsen/logrus"
 	"errors"
+	"fmt"
+	"github.com/golang-jwt/jwt/v4"
+	log "github.com/sirupsen/logrus"
 	"net/http"
 )
 
@@ -65,4 +65,3 @@ func parseJwtCookie(request *http.Request) (string, string) {
 
 	return username, usergroup
 }
-