still working on SSO bug