That sounds like a good idea. It would probably make sense to require that they specify how long you get to lease it for, rather than the current situation which is pretty much "until we decide not to run the service anymore".