diff --git a/agent/consul/state/acl.go b/agent/consul/state/acl.go index fb19377a30..a0ddc1cea2 100644 --- a/agent/consul/state/acl.go +++ b/agent/consul/state/acl.go @@ -528,7 +528,9 @@ func aclTokenSetTxn(tx WriteTxn, idx uint64, token *structs.ACLToken, opts ACLTo } if token.AuthMethod != "" && !opts.FromReplication { - method, err := getAuthMethodWithTxn(tx, nil, token.AuthMethod, token.ACLAuthMethodEnterpriseMeta.ToEnterpriseMeta()) + methodMeta := token.ACLAuthMethodEnterpriseMeta.ToEnterpriseMeta() + methodMeta.Merge(&token.EnterpriseMeta) + method, err := getAuthMethodWithTxn(tx, nil, token.AuthMethod, methodMeta) if err != nil { return err } else if method == nil {