login/logout #SH-6 fixed