Fix user index ordering