Slight tweak to support changing users between auth types.