diff --git a/apps/tb/templates/tb/letters/partials/index_case.html b/apps/tb/templates/tb/letters/partials/index_case.html
index 90a7af475..4adff53d0 100644
--- a/apps/tb/templates/tb/letters/partials/index_case.html
+++ b/apps/tb/templates/tb/letters/partials/index_case.html
@@ -1,4 +1,3 @@
-{% load elcid_utils %}
 {% if index_case_list.exists %}
   <b>
     {{ models.IndexCase.get_display_name }}{{ index_case_list|pluralize}}:
@@ -14,7 +13,7 @@
     # {{ index_case.hospital_number }}
     {% endif %}
     {% if index_case.diagnosis_day or index_case.diagnosis_month or index_case.diagnosis_year %}
-      {{ index_case.diagnosis_day }} {{ index_case.diagnosis_month|month }} {{ index_case.diagnosis_year }}
+      {{ index_case.diagnosis_day }} [[{{ index_case.diagnosis_month }}|month ]] {{ index_case.diagnosis_year }}
     {% endif %}
     <br />
     {% endif %}
diff --git a/apps/tb/templates/tb/letters/partials/tb_history.html b/apps/tb/templates/tb/letters/partials/tb_history.html
index 1c42db47d..0f4e43272 100644
--- a/apps/tb/templates/tb/letters/partials/tb_history.html
+++ b/apps/tb/templates/tb/letters/partials/tb_history.html
@@ -1,4 +1,3 @@
-{% load elcid_utils %}
 <b>
   Previous TB Diagnosis:
 </b>
@@ -7,7 +6,7 @@
   {{ tb_history.tb_type }} {{ tb_history.site_of_tb }}
   {% if tb_history.diagnosis_date_year or tb_history.diagnosis_date_month or tb_history.diagnosis_date_day %}
     -
-  {{ tb_history.diagnosis_date_day }} {{ tb_history.diagnosis_date_month|month }} {{ tb_history.diagnosis_date_year }}
+  {{ tb_history.diagnosis_date_day }} [[ {{ tb_history.diagnosis_date_month }}|month ]] {{ tb_history.diagnosis_date_year }}
   {% endif %}
   <br />
 
diff --git a/elcid/templatetags/elcid_utils.py b/elcid/templatetags/elcid_utils.py
deleted file mode 100644
index 3880fb699..000000000
--- a/elcid/templatetags/elcid_utils.py
+++ /dev/null
@@ -1,47 +0,0 @@
-from django import template
-register = template.Library()
-
-
-@register.filter
-def month(input):
-    """
-    Takes an integer returns a month
-    """
-    if input == 1:
-        return "Jan"
-
-    if input == 2:
-        return "Feb"
-
-    if input == 3:
-        return "Mar"
-
-    if input == 4:
-        return "Apr"
-
-    if input == 5:
-        return "May"
-
-    if input == 6:
-        return "Jun"
-
-    if input == 7:
-        return "Jul"
-
-    if input == 8:
-        return "Aug"
-
-    if input == 9:
-        return "Sep"
-
-    if input == 10:
-        return "Oct"
-
-    if input == 11:
-        return "Nov"
-
-    if input == 12:
-        return "Dec"
-
-    return ""
-