Fix User Sorting
Fix More User Sorting