Revert "Revert "Quick Unlock fix""

This reverts commit e43517a90157aa26cd71aa83376256da0b700f04.