User management fix