Refactor / Microsoft Live authentication support