Additional auto-deactivate options

I already suggested a solution here. Sadly there was no update about this.