Re-added support for logout