diff --git a/ChangeLog b/ChangeLog
index f62767fe0..c58bc1977 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-20  Don Allingham  <don@gramps-project.org>
+	* src/Editors/_EditName.py: autocomplete for surnames
+	* src/glade/gramps.glade: set focus properly
+
 2006-11-20  Brian Matherly  <brian@gramps-project.org>
 	* src/plugins/DetDescendantReport.py: Use callname instead of nickname (#0000557)
 	* src/plugins/DetAncestralReport.py: Use callname instead of nickname (#0000557)
diff --git a/src/Editors/_EditName.py b/src/Editors/_EditName.py
index edc7fb2f3..2fd74bee9 100644
--- a/src/Editors/_EditName.py
+++ b/src/Editors/_EditName.py
@@ -147,6 +147,7 @@ class EditName(EditSecondary):
             self.obj.set_surname,
             self.obj.get_surname,
             self.db.readonly,
+            autolist=self.db.get_surname_list(),
             changed=self.update_group_as)
 
         self.prefix_field = MonitoredEntry(
diff --git a/src/glade/gramps.glade b/src/glade/gramps.glade
index ab06671c2..a0090e567 100644
--- a/src/glade/gramps.glade
+++ b/src/glade/gramps.glade
@@ -8712,6 +8712,7 @@
 		<widget class="GtkEntry" id="alt_surname">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
+		  <property name="has_focus">True</property>
 		  <property name="editable">True</property>
 		  <property name="visibility">True</property>
 		  <property name="max_length">0</property>
@@ -8959,7 +8960,6 @@
 		<widget class="GtkEntry" id="alt_given">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-		  <property name="has_focus">True</property>
 		  <property name="editable">True</property>
 		  <property name="visibility">True</property>
 		  <property name="max_length">0</property>