Return a logout callback always

Fix logout callback to be returned.