revert back to before introducing SSO ID