Added login/logout/