Fix upgrade from password to OAuth2