More logout fixing