Minor fixes for when the user was logged and then unlogged with the tool open.