SSO to A7P fix