User management

**Ready to merge**