diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 2d91dd16f..3302b44c2 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-29    Don Allingham  <don@gramps-project.org>
+	* src/Utils.py: fix probably_alive to handle year offset properly
+	* src/plugins/NavWebPage.py: handle new probably_alive function
+
 2005-08-29  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
 	* src/plugins/NavWebPage.py: Correct link to Surname list page;
 	Better handling for not existing media object files and note-only
diff --git a/gramps2/src/Utils.py b/gramps2/src/Utils.py
index 387f40afa..f5f89db7d 100644
--- a/gramps2/src/Utils.py
+++ b/gramps2/src/Utils.py
@@ -450,7 +450,7 @@ def create_id():
     return s
 
 
-def probably_alive(person,db,current_year=None):
+def probably_alive(person,db,current_year=None,limit=0):
     """Returns true if the person may be alive.
 
     This works by a process of emlimination. If we can't find a good
@@ -469,9 +469,9 @@ def probably_alive(person,db,current_year=None):
         death = db.get_event_from_handle(person.death_handle)
         if death.get_date_object().get_start_date() != Date.EMPTY:
             death_year = death.get_date_object().get_year()
-            if death_year < current_year:
+            if death_year - limit < current_year:
                 return False
-    
+
     # Look for Cause Of Death, Burial or Cremation events.
     # These are fairly good indications that someone's not alive.
     for ev_handle in person.event_list:
@@ -483,7 +483,7 @@ def probably_alive(person,db,current_year=None):
             if not death_year:
                 death_year = ev.get_date_object().get_year()
             if ev.get_date_object().get_start_date() != Date.EMPTY:
-                if ev.get_date_object().get_year() < current_year:
+                if ev.get_date_object().get_year() - limit < current_year:
                     return False
 
     if not current_year:
@@ -498,21 +498,15 @@ def probably_alive(person,db,current_year=None):
         if birth.get_date_object().get_start_date() != Date.EMPTY:
             if not birth_year:
                 birth_year = birth.get_date_object().get_year()
-            if birth.get_date_object().get_year() > current_year:
-                # person is not yet born
-                return False
             r = not_too_old(birth.get_date_object(),current_year)
             if r:
-                #print person.get_primary_name().get_name(), " is alive because they were born late enough."
                 return True
     
-    
     if not birth_year and death_year:
         if death_year > current_year + 110:
             # person died more tha 110 after current year
             return False
             
-
     # Neither birth nor death events are available.  Try looking
     # for descendants that were born more than a lifespan ago.
 
@@ -616,7 +610,6 @@ def probably_alive(person,db,current_year=None):
 
         return False
 
-
     # If there are ancestors that would be too old in the current year
     # then assume our person must be dead too.
     if ancestors_too_old (person, current_year):
diff --git a/gramps2/src/plugins/NavWebPage.py b/gramps2/src/plugins/NavWebPage.py
index e5a1a4741..8bb52583b 100644
--- a/gramps2/src/plugins/NavWebPage.py
+++ b/gramps2/src/plugins/NavWebPage.py
@@ -1876,7 +1876,7 @@ class WebReport(Report.Report):
             self.progress.set_pass(_('Applying privacy filter'),len(ind_list))
             ind_list = filter(self.filter_private,ind_list)
 
-        years = time.localtime(time.time())[0] - self.restrict_years
+        years = time.localtime(time.time())[0]
 
         # Filter out people who are restricted due to the living
         # people rule
@@ -1886,7 +1886,7 @@ class WebReport(Report.Report):
             for key in ind_list:
                 self.progress.step()
                 p = self.database.get_person_from_handle(key)
-                if Utils.probably_alive(p,self.database,years):
+                if Utils.probably_alive(p,self.database,years,self.restrict_years):
                     restrict_list.add(key)
 
         return (ind_list,restrict_list)