user management modules refactored and updated