diff --git a/pkg/auth/nodeidentifier/default.go b/pkg/auth/nodeidentifier/default.go
index 7375a275cf..5fa994c73e 100644
--- a/pkg/auth/nodeidentifier/default.go
+++ b/pkg/auth/nodeidentifier/default.go
@@ -50,8 +50,6 @@ func (defaultNodeIdentifier) NodeIdentity(u user.Info) (string, bool) {
 		return "", false
 	}
 
-	nodeName := strings.TrimPrefix(userName, nodeUserNamePrefix)
-
 	isNode := false
 	for _, g := range u.GetGroups() {
 		if g == user.NodesGroup {
@@ -63,5 +61,6 @@ func (defaultNodeIdentifier) NodeIdentity(u user.Info) (string, bool) {
 		return "", false
 	}
 
-	return nodeName, isNode
+	nodeName := strings.TrimPrefix(userName, nodeUserNamePrefix)
+	return nodeName, true
 }