I was under the impression that Android did something like this upon factory reset (asking for previous PIN before you can set the phone up again). Is it effective?
That sounds very effective to me. That's the only way to stop thieves. Put your passwords in your password manager. I'm sure you have more than one device!