In case of persistent NameID, use the userid.
Merge pull request #77 from novapost/persistent_userid

In case of persistent NameID, use the userid.