Some more Hybrid Auth updates