place NameIDFormat elements in correct location