Cloud unification: add/remove credentials improved