Support for logout options
whitespace fix