Adding support for logoff