Merge pull request #20055 from davidjosephhayes/fix-authx-setting-display