Make it possible to update UserCredential without losing roles