Add support for automatically (and optionally) clearing on signout