Fix logout issue

In progress

Sat Jun 01 2024

Fix the issue where users are unable to log out properly.