removing refs to usernames, I'd like to use email addrs only.