Further logged-out bug fixing