Make user list query over username or email

Refs #5757