Added a bunch of stuff for creating users, largely untested, as I can't send email right now