ADFS modifications