Added username field, and validations