USER_SAML: fixed some code issues