Add NameId if not present
Merge pull request #642 from thinktecture/Fix_Add_NameIdentifier_Claim_for_all_Code_Paths

Add NameId if not present