Added the ability to permanently enable lock overriding