Personally I find the friction of a factory reset to be enough, but yeah this doesn't work if you don't. I'm pretty sure [1] can be set up not not be bypassed but I don't know for sure.