Non-logged in user bug fix