diff --git a/ChangeLog b/ChangeLog
index be5258c1b..bb89e3e10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-15  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
+	* src/plugins/WebPage.py (dump_gendex): Files are named by GRAMPS ID;
+	Alway print fields for birth/death; Fixed typo in DateHandler
+
 2005-04-14  Don Allingham  <don@gramps-project.org>
 	* src/plugins/Check.py: loop through family relationships until all
 	problems are resolved
diff --git a/src/plugins/WebPage.py b/src/plugins/WebPage.py
index 4c30f3c5c..138eb4398 100644
--- a/src/plugins/WebPage.py
+++ b/src/plugins/WebPage.py
@@ -832,7 +832,7 @@ class WebReport(Report.Report):
             surName = name.get_surname()
             suffix = name.get_suffix()
 
-            f.write("%s.%s|" % (p_id,self.ext))
+            f.write("%s.%s|" % (p.get_gramps_id(),self.ext))
             f.write("%s|" % surName)
             if suffix == "":
                 f.write("%s /%s/|" % (firstName,surName))
@@ -842,9 +842,9 @@ class WebReport(Report.Report):
                 if e_id:
                     e = self.database.get_event_from_handle(e_id)
                 else:
-                    continue
+                    e = None
                 if e:
-                    f.write("%s|" % DateHander.displayer.display(e.get_date_object()))
+                    f.write("%s|" % DateHandler.displayer.display(e.get_date_object()))
                     if e.get_place_handle():
                         f.write('%s|' % self.database.get_place_from_handle(e.get_place_handle()).get_title())
                     else: