Updated User-management fix for possible error.