diff --git a/templates/macros/format_date.html b/templates/macros/format_date.html
index a487484..6133281 100644
--- a/templates/macros/format_date.html
+++ b/templates/macros/format_date.html
@@ -1,8 +1,8 @@
 {% macro format_date(date, short) %}
 
-{% if config.extra.short_date_format %}
+{% if config.extra.short_date_format and short %}
     {{ date | date(format=config.extra.short_date_format) }}
-{% elif config.extra.long_date_format %}
+{% elif config.extra.long_date_format and not short %}
     {{ date | date(format=config.extra.long_date_format) }}
 {% else %}
     {% set day = date | date(format='%-d') | int %}
@@ -23,10 +23,11 @@
     {% endif %}
 
     {# Return the date. #}
+    {{ date | date(format="%-d") }}{{ suffix }} 
     {% if short == true %}
-        {{ date | date(format="%-d") }}{{ suffix }} {{ date | date(format="%b %Y") }}
+        {{ date | date(format="%b %Y") }}
     {% else %}
-        {{ date | date(format="%-d") }}{{ suffix }} {{ date | date(format="%B %Y") }}
+        {{ date | date(format="%B %Y") }}
     {% endif %}
 {% endif %}