Improve ADFS compatibility. #37