Improve UX on logout function