fix calendar and logout