diff --git a/internal/config/config.go b/internal/config/config.go
index 5fd61ad..b154d9b 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -72,6 +72,8 @@ type Config struct {
 	ShowNewVersions                 bool
 	AuthJwtCookieName               string
 	AuthJwtSecret                   string
+	AuthJwtClaimUsername            string
+	AuthJwtClaimUserGroup           string
 	DefaultPermissions              PermissionsList
 	AccessControlLists              []AccessControlList
 }
@@ -93,6 +95,8 @@ func DefaultConfig() *Config {
 	config.CheckForUpdates = true
 	config.DefaultPermissions.Exec = true
 	config.DefaultPermissions.View = true
+	config.AuthJwtClaimUsername = "name"
+	config.AuthJwtClaimUserGroup = "group"
 
 	return &config
 }
diff --git a/internal/httpservers/restapi.go b/internal/httpservers/restapi.go
index b314b15..fa3cf78 100644
--- a/internal/httpservers/restapi.go
+++ b/internal/httpservers/restapi.go
@@ -88,8 +88,8 @@ func startRestAPIServer(globalConfig *config.Config) error {
 				return nil
 			}
 
-			username := lookupClaimValueOrDefault(claims, "name", "none")
-			usergroup := lookupClaimValueOrDefault(claims, "group", "none")
+			username := lookupClaimValueOrDefault(claims, cfg.AuthJwtClaimUsername, "none")
+			usergroup := lookupClaimValueOrDefault(claims, cfg.AuthJwtClaimUserGroup, "none")
 
 			md := metadata.Pairs(
 				"username", username,