Fix logout due to merge