add in pin locking (bug 826813)
and actually reset (bug 826813)