Fix logout/login issue?