Add default User collection + minor changes

There are some additional changes in here from previous commits, we had to tweak the mailer service a little to get it to work.