added /users and tweaking mailers
fixed merge conflict