Improved support to logouts