Fixed a bug which was not allowing Shield to be de-activated from Settings.