Hi Wayne,
I've implemented both this change, and the change you asked for a little while ago about checking if system restore is enabled and enabling it if it's not. I will be testing it over the next day or so and if it's working I'll update the tool online and let you know.
Thanks!
Garrett