User management enhancements #1878