first attempt at fixing sso