Revert "Revert "Feature 10941: User Management Enhancements""