add ability to disable key-save mechanism