diff --git a/ChangeLog b/ChangeLog
index dd09f0c55..b9a2d5a40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2003-12-01  Alex Roitman  <shura@alex.neuro.umn.edu>
-	* src/FamilyView.py (add_child_clicked): Return tuple of two 
-	empty strings when the surname guessing is set to None (otherwise
-	it produced traceback and did nothing).
+	* src/FamilyView.py (add_child_clicked): Call self.no_name() 
+	when the surname guessing is set to "None" (otherwise it produced 
+	traceback and did nothing).
 	* doc/gramps-manual/C/custom.xml: Update.
 	* doc/gramps-manual/C/gramps-manual-C.omf: Update.
 	* doc/gramps.1.in: Update.
diff --git a/src/FamilyView.py b/src/FamilyView.py
index 55bbbfdd1..1bf8ed296 100644
--- a/src/FamilyView.py
+++ b/src/FamilyView.py
@@ -599,7 +599,7 @@ class FamilyView:
         elif autoname == 3:
             name = self.icelandic(0)
         else:
-            name = ("","")
+            name = self.no_name(0)
         person.getPrimaryName().setSurname(name[1])
         person.getPrimaryName().setSurnamePrefix(name[0])