fixes and enhancements on user management