Instead of having a deposit attached to a service it should be attached to the client account instead so that the deposit doesn't disappear if the service is changed.