Fix bug for non-logged in user
Fix bug for non-logged in user