Changed some fields in User.java