Fix the ordering of the user