Replacing client/key