User management update & bug fixes