diff --git a/src/EditPerson.py b/src/EditPerson.py
index 62882d4b7..f31995114 100644
--- a/src/EditPerson.py
+++ b/src/EditPerson.py
@@ -284,8 +284,7 @@ class EditPerson:
 
         types = const.NameTypesMap.keys()
         types.sort()
-        self.ntype_field.set_popdown_strings(types)
-        self.autotype = AutoComp.AutoEntry(self.ntype_field.entry,types)
+        self.autotype = AutoComp.AutoCombo(self.ntype_field,types)
         self.write_primary_name()
         
         if person.getGender() == RelLib.Person.male:
diff --git a/src/edit_person.glade b/src/edit_person.glade
index 6acf49ac3..459c48c8f 100644
--- a/src/edit_person.glade
+++ b/src/edit_person.glade
@@ -593,7 +593,7 @@
 		      <child>
 			<widget class="GtkCombo" id="ntype">
 			  <property name="visible">True</property>
-			  <property name="value_in_list">True</property>
+			  <property name="value_in_list">False</property>
 			  <property name="allow_empty">False</property>
 			  <property name="case_sensitive">False</property>
 			  <property name="enable_arrow_keys">True</property>