Back to using QueryWithLogin and renamed login to _login.