Performance enhancement removing extra query when not signed in