Fixed marriage status autofill