FS-3842 --resolve I think these feilds were recently only made optional when register=true. This should take care of it.