Added filtering of users to just email addys