Changed: revered username field of User model (just the field) back to username