Fix fields for all other version in User class