Re-did the unlock disabling mechanism, which disappeared due to code conflict