Fixing User/List