(UserManagement) Review follow-up