diff --git a/changelog.html b/changelog.html
index 0350db02f..f0fa260b1 100644
--- a/changelog.html
+++ b/changelog.html
@@ -46,6 +46,7 @@ <h1>
 
 <p><b>1.2.7</b> -- To De Determined</p>
 <ul>
+    <li>[<a href='https://github.com/igniterealtime/openfire-sip-plugin/issues/17'>Issue #17</a>] - Replace CalendarJS library.</li>
 </ul>
 
 <p><b>1.2.{2,6}</b> -- December 4, 2020</p>
diff --git a/plugin.xml b/plugin.xml
index fe2e5a7db..337fe0669 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -6,7 +6,7 @@
     <description>Provides support for SIP account management</description>
     <author>Ignite Realtime</author>
     <version>${project.version}</version>
-    <date>12/17/2020</date>
+    <date>2022-03-04</date>
     <databaseKey>sip</databaseKey>
     <databaseVersion>2</databaseVersion>
     <minServerVersion>4.0.0</minServerVersion>
diff --git a/src/i18n/sip_i18n.properties b/src/i18n/sip_i18n.properties
index e50c2d66a..e62198a05 100644
--- a/src/i18n/sip_i18n.properties
+++ b/src/i18n/sip_i18n.properties
@@ -117,7 +117,6 @@ archive.search.daterange.tooltip = Enter specific date ranges to search between.
 archive.search.daterange.start = Start:
 archive.search.daterange.end = End:
 archive.search.daterange.any = Any
-archive.search.daterange.format = Use mm/dd/yy
 archive.search.daterange.error = The end time must be after the start time.
 archive.settings.any = Any
 cancel = Cancel
diff --git a/src/i18n/sip_i18n_cs_CZ.properties b/src/i18n/sip_i18n_cs_CZ.properties
index b01aee676..8ab23c16d 100644
--- a/src/i18n/sip_i18n_cs_CZ.properties
+++ b/src/i18n/sip_i18n_cs_CZ.properties
@@ -119,7 +119,6 @@ archive.search.daterange.tooltip = Zadejte specifický rozsah datumů, mezi kter
 archive.search.daterange.start = Začátek:
 archive.search.daterange.end = Konec:
 archive.search.daterange.any = Kdykoli
-archive.search.daterange.format = Použijte mm/dd/yy
 archive.search.daterange.error = Koncové datum musí být po počátečním čase.
 archive.settings.any = Jakýkoli
 cancel = Zrušit
diff --git a/src/i18n/sip_i18n_es.properties b/src/i18n/sip_i18n_es.properties
index c27c1e7ba..0803398c0 100644
--- a/src/i18n/sip_i18n_es.properties
+++ b/src/i18n/sip_i18n_es.properties
@@ -119,7 +119,6 @@ archive.search.daterange.tooltip = Ingrese un rango de fechas específico para b
 archive.search.daterange.start = Inicio:
 archive.search.daterange.end = Fin:
 archive.search.daterange.any = Cualquiera
-archive.search.daterange.format = Formato mm/dd/yy
 archive.search.daterange.error = La fecha de fin debe ser posterior a la de inicio.
 archive.settings.any = Cualquiera
 cancel = Cancelar
diff --git a/src/i18n/sip_i18n_fr.properties b/src/i18n/sip_i18n_fr.properties
index 6c2a9923d..405883feb 100644
--- a/src/i18n/sip_i18n_fr.properties
+++ b/src/i18n/sip_i18n_fr.properties
@@ -115,7 +115,6 @@ archive.search.daterange=Dates:
 archive.search.daterange.any=N'importe
 archive.search.daterange.end=Fin:
 archive.search.daterange.error=L'heure de fin doit etre après l'heure de départ.
-archive.search.daterange.format=Utilisez mm/jj/aa
 archive.search.daterange.start=Départ:
 archive.search.daterange.tooltip=Veuillez entrer les dates ente lequelles vous souhaitez rechercher. Vous pouvez choisir une date de départ et/ou une date de fin.
 archive.settings.any=N'importe
diff --git a/src/i18n/sip_i18n_pt_BR.properties b/src/i18n/sip_i18n_pt_BR.properties
index d5388b59c..b6a3cf720 100644
--- a/src/i18n/sip_i18n_pt_BR.properties
+++ b/src/i18n/sip_i18n_pt_BR.properties
@@ -103,7 +103,6 @@ archive.search.daterange.tooltip = Insira intervalo de datas específico para pe
 archive.search.daterange.start = Início:
 archive.search.daterange.end = Final:
 archive.search.daterange.any = Qualquer
-archive.search.daterange.format = Utilize mm/dd/aa
 archive.search.daterange.error = A hora final deve ser após a hora inicial
 archive.settings.any = Qualquer
 cancel = Cancelar
diff --git a/src/i18n/sip_i18n_ru_RU.properties b/src/i18n/sip_i18n_ru_RU.properties
index 9bcf871a5..6d3cf56d4 100644
--- a/src/i18n/sip_i18n_ru_RU.properties
+++ b/src/i18n/sip_i18n_ru_RU.properties
@@ -115,7 +115,6 @@ archive.search.daterange.tooltip = Введите определенные ди
 archive.search.daterange.start = Начало:
 archive.search.daterange.end = Конец:
 archive.search.daterange.any = Любая
-archive.search.daterange.format = Используйте мм/дд/гг
 archive.search.daterange.error = Время окончания должно быть после времени начала.
 archive.settings.any = Любая
 cancel = Отмена
diff --git a/src/i18n/sip_i18n_zh_CN.properties b/src/i18n/sip_i18n_zh_CN.properties
index 7e5326dc6..69d1715ef 100644
--- a/src/i18n/sip_i18n_zh_CN.properties
+++ b/src/i18n/sip_i18n_zh_CN.properties
@@ -119,7 +119,6 @@ archive.search.daterange.tooltip = 输入一个指定的日期用于搜索。您
 archive.search.daterange.start = 开始:
 archive.search.daterange.end = 结束:
 archive.search.daterange.any = 任何一项
-archive.search.daterange.format = 使用 mm/dd/yy
 archive.search.daterange.error = 结束时间必须在开始时间之后。
 archive.settings.any = 任何一项
 cancel = 取消
diff --git a/src/web/images/icon_calendarpicker.gif b/src/web/images/icon_calendarpicker.gif
deleted file mode 100644
index 916e15753..000000000
Binary files a/src/web/images/icon_calendarpicker.gif and /dev/null differ
diff --git a/src/web/images/icon_daterange.gif b/src/web/images/icon_daterange.gif
new file mode 100644
index 000000000..65acae3de
Binary files /dev/null and b/src/web/images/icon_daterange.gif differ
diff --git a/src/web/sipark-log-summary.jsp b/src/web/sipark-log-summary.jsp
index c9a6b2ac6..a32c6838e 100644
--- a/src/web/sipark-log-summary.jsp
+++ b/src/web/sipark-log-summary.jsp
@@ -29,10 +29,6 @@
     <script src="/js/scriptaculous.js" type="text/javascript"></script>
     <script type="text/javascript" language="javascript" src="/js/tooltips/domLib.js"></script>
     <script type="text/javascript" language="javascript" src="/js/tooltips/domTT.js"></script>
-    <style type="text/css">@import url( /js/jscalendar/calendar-win2k-cold-1.css );</style>
-    <script type="text/javascript" src="/js/jscalendar/calendar.js"></script>
-    <script type="text/javascript" src="/js/jscalendar/i18n.jsp"></script>
-    <script type="text/javascript" src="/js/jscalendar/calendar-setup.js"></script>
     <style type="text/css">
         .jive-current {
             font-weight: bold;
@@ -183,7 +179,13 @@
         }
 
         if (startDate != null && startDate.length() > 0) {
-            DateFormat formatter = new SimpleDateFormat("MM/dd/yy");
+            DateFormat formatter;
+            if (startDate.contains("/")) {
+                // This was used by the old calendarjs code. Retain it to not break old links/bookmarks, etc.
+                formatter = new SimpleDateFormat("MM/dd/yy");
+            } else {
+                formatter = new SimpleDateFormat("yyyy-MM-dd");
+            }
             try {
                 fromDate = formatter.parse(startDate);
             }
@@ -194,12 +196,18 @@
         }
 
         if (endDate != null && endDate.length() > 0) {
-            DateFormat formatter = new SimpleDateFormat("MM/dd/yy");
+            DateFormat formatter;
+            if (endDate.contains("/")) {
+                // This was used by the old calendarjs code. Retain it to not break old links/bookmarks, etc.
+                formatter = new SimpleDateFormat("MM/dd/yy");
+            } else {
+                formatter = new SimpleDateFormat("yyyy-MM-dd");
+            }
             try {
                 Date date = formatter.parse(endDate);
                 // The user has chosen an end date and expects that any conversation
                 // that falls on that day will be included in the search results. For
-                // example, say the user choose 6/17/2006 as an end date. If a conversation
+                // example, say the user choose 2006-06-17 as an end date. If a conversation
                 // occurs at 5:33 PM that day, it should be included in the results. In
                 // order to make this possible, we need to make the end date one millisecond
                 // before the next day starts.
@@ -268,7 +276,7 @@
             <td>
                 <table>
                     <tr>
-                        <td colspan="3">
+                        <td colspan="2">
                             <img src="images/icon_daterange.gif" align="absmiddle" alt="" style="margin: 0px 4px 0px 2px;"/>
                             <b><fmt:message key="archive.search.daterange" /></b>
                             <a onmouseover="domTT_activate(this, event, 'content',
@@ -279,25 +287,17 @@
                     <tr valign="top">
                         <td><fmt:message key="archive.search.daterange.start" /></td>
                         <td>
-                            <input type="text" id="startDate" name="startDate" size="13"
+                            <input type="date" id="startDate" name="startDate" size="13"
                                    value="<%= startDate != null ? startDate :
                                    LocaleUtils.getLocalizedString("archive.search.daterange.any", "sip")%>" class="textfield"/><br/>
-                            <span class="jive-description"><fmt:message key="archive.search.daterange.format" /></span>
-                        </td>
-                        <td>
-                            <img src="images/icon_calendarpicker.gif" vspace="3" id="startDateTrigger">
                         </td>
                     </tr>
                     <tr valign="top">
                         <td><fmt:message key="archive.search.daterange.end" /></td>
                         <td>
-                            <input type="text" id="endDate" name="endDate" size="13"
+                            <input type="date" id="endDate" name="endDate" size="13"
                                    value="<%= endDate != null ? endDate :
                                    LocaleUtils.getLocalizedString("archive.search.daterange.any", "sip") %>" class="textfield"/><br/>
-                            <span class="jive-description"><fmt:message key="archive.search.daterange.format" /></span>
-                        </td>
-                        <td>
-                            <img src="images/icon_calendarpicker.gif" vspace="3" id="endDateTrigger">
                         </td>
                     </tr>
                 </table>
@@ -530,22 +530,6 @@
             startDateField.value = "<fmt:message key="archive.search.daterange.any" />";
         }
     }
-
-    Calendar.setup(
-    {
-        inputField  : "startDate",         // ID of the input field
-        ifFormat    : "%m/%d/%y",    // the date format
-        button      : "startDateTrigger",       // ID of the button
-        onUpdate    :  catcalc
-    });
-
-    Calendar.setup(
-    {
-        inputField  : "endDate",         // ID of the input field
-        ifFormat    : "%m/%d/%y",    // the date format
-        button      : "endDateTrigger",       // ID of the button
-        onUpdate    :  catcalc
-    });
 </script>
 </body>
 </html>