You are right. I will change it.

I was going on using the "lockalways" option and found bad news: If the phone gets locked via "lockalways" everything is as expected, namely phone is "SMSCON-able" but finder/thief can't use it because its locked. User can only shutdown+reboot. But in this case, the lock-code question comes first again, before SIM-pin question. Now we are at same point we've been already. Means: For those regular users which make use of device locking et all the "lockalways" option provides only and exactly one more chance to contact the phone in cases where finder/thief reboots it (no matter if with/or without new SIM).

This, I think, is a better situation to them as before. But not perfect. I can imagine even better phone behavior. As far I can see, it ends up in not making use of built-in device lock functionality: A "device lock" we need:

• must behave as a lock concerning our private data which is on the phone.
  Reason is evident.
• must not behave as a lock concerning phone usage (sms, telephony, network, camera, microphone, sound, sensors, etc...).
  Reason: Even SMSCON depends on that stuff.
• must make a finder/thief think that it is not locked.
  Reason: A locked device is unusable and a good reason to turn it off, throw away or re-flash it.

So there is still work to do.