Add fix for weird username field issue