User management up, few bug fixes