Fix SSO with new window - refs BT#8692