Organization claim is lost when using SAML

[omgitstom]

I ran into this with Account Linking and it looks like the organizational claim is lost when using SAML authentication.

We need to make sure the org claim is represented correctly when using SAML for account linking and to make sure we get the org claim in the access token