added login/logout suport
fixing merge