Polishing up the account federation code.