I think patching actions that circumvent auto log out would be better soluttion.