Change order of default/required check so required is checked first.