Fix User indexes