fixing yield logic for non-logged in users