Fix fields for all other version in User class
fix line ending