Upgrades to Single Sign-On support


#1