Fixes in user management module