We’ll begin on the AD FS 2.0 side by creating two custom claims descriptions. If you read the previous post concerning AD FS 2.0 Rollup 1: Client Access Policy Support for O365, then you may recognize this process. From the AD FS 2.0 MMC snapin and service panel, I’ve create two custom claims descriptions: