fixing on sso (BAM-1293)