Jennifer,
Currently the best method to control what devices are targeted in a task it to set the query up to resolve machines and not users. That way when the query resolves it only pulls in those machines, and not all machines that a user has logged into.
Let me know if you have more questions.
Thanks,
Bryce.