minor improvements on user management