Enhancements for LockForm