Fix setting default value on required fields