Principal Name is actually Principal Id for some of our clients. 

We need to check this as both. I added the change and verified that this doesn't break anything; however, we won't know if it fixes our SAML integration until we try it out on a live system.

fixes rSmart/issues#420