NameId: don't include policy of not set

If we don't want a nameid, don't bother asking for one.