Ext 299 sso fix 2