diff --git a/gramps/plugins/webreport/webcal.py b/gramps/plugins/webreport/webcal.py
index 4163fd39e..54d076d7c 100644
--- a/gramps/plugins/webreport/webcal.py
+++ b/gramps/plugins/webreport/webcal.py
@@ -8,7 +8,7 @@
 # Copyright (C) 2008-2011 Rob G. Healey <robhealey1@gmail.com>
 # Copyright (C) 2008      Jason Simanek
 # Copyright (C) 2010      Jakim Friant
-# Copyright (C) 2015-2016 Serge Noiraud
+# Copyright (C) 2015-     Serge Noiraud
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -34,6 +34,7 @@ Web Calendar generator.
 #------------------------------------------------------------------------
 import os, shutil
 import datetime
+import time
 import calendar # Python module
 
 #------------------------------------------------------------------------
@@ -146,6 +147,10 @@ class WebCalReport(Report):
         self.multiyear = mgobn('multiyear')
         self.start_year = mgobn('start_year')
         self.end_year = mgobn('end_year')
+        if not self.multiyear:
+            self.end_year = self.start_year
+        if self.end_year < self.start_year:
+            self.end_year = self.start_year
 
         self.maiden_name = mgobn('maiden_name')
 
@@ -512,6 +517,7 @@ class WebCalReport(Report):
         # limit number of years to eighteen (18) years and only one row of years
         nyears = ((self.end_year - self.start_year) + 1)
         num_years = nyears if 0 < nyears < 19 else 18
+        self.end_year = (self.start_year + 17) if nyears > 18 else self.end_year
 
         # begin year division and begin unordered list
         with Html("div", id="subnavigation",
@@ -1563,8 +1569,8 @@ class WebCalReport(Report):
         index, body = self.write_header(nr_up, title, "index", False)
 
         # create Year Navigation menu
-        if self.multiyear and ((self.end_year - self.start_year) > 0):
-            body += self.year_navigation(nr_up, str(2016))
+        current_year = time.strftime("%Y", time.gmtime())
+        body += self.year_navigation(nr_up, str(current_year))
 
         # create blank line for stylesheets
         # write footer section