Fix the user ordering