Sorry to revive such an old thread, but I have *exactly* the same problem on my Z and wondered if the reset turned out to be a permanent fix or not?
I'm locking it manually right now, which is fine, but I'd like to get it sorted sooner rather than later obviously.
Cheers