Changed order of user fields