fixed non-logged-in user issues