First pass at auto logoff support