Added username field to forms