add in pin locking (bug 826813)