Updated login/logout + added two factor auth. class