* Firmed up the login/logout process