Bugfix for non logged-in user