Unable to merge users after SSO switch

@TGP, are you all set here? Jeff pinged one of my test users (which I’ve now deleted), so I didn’t see this mention. Apologies.