diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index b0259c623..eb08d356f 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-18  Don Allingham  <dallingham@users.sourceforge.net>
+	* src/EditPerson.py: fix None gramps_id for new person
+	* src/PeopleModel.py: add sort_name back in
+
 2004-08-18  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* configure.in: Check for pygtk instead of pygtk-dev.
 	* src/accent.py: Replace unknown chars with "?". 
diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py
index 21626afb7..7dd94ef96 100644
--- a/gramps2/src/EditPerson.py
+++ b/gramps2/src/EditPerson.py
@@ -296,8 +296,10 @@ class EditPerson:
         build_dropdown(self.bplace,self.place_list)
         build_dropdown(self.dplace,self.place_list)
         build_dropdown(self.surname,self.db.get_surname_list())
-            
-        self.gid.set_text(person.get_gramps_id())
+
+        gid = person.get_gramps_id()
+        if gid:
+            self.gid.set_text(gid)
         self.gid.set_editable(1)
 
         self.lds_baptism = RelLib.LdsOrd(self.person.get_lds_baptism())
diff --git a/gramps2/src/PeopleModel.py b/gramps2/src/PeopleModel.py
index 6d43a58a8..332923352 100644
--- a/gramps2/src/PeopleModel.py
+++ b/gramps2/src/PeopleModel.py
@@ -85,6 +85,7 @@ class PeopleModel(gtk.GenericTreeModel):
             self.column_death_day,
             self.column_death_place,
             self.column_spouse,
+            self.sort_name,
             ]
 
         maps = self.db.get_people_view_maps()