Fix to also work when not logged in