diff --git a/files/templates/submission.html b/files/templates/submission.html
index ef7c1c7b85..d8b8fa5af1 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -318,17 +318,22 @@
- {% if p.realurl(v) %}
+ {% if p.club %}
+ Country Club
+ {% endif %}
+ {% if p.flair %}
+
+ {{p.flair | safe}}
+
+ {% endif %}
+ {% if p.realurl(v) %}
{{p.realtitle(v) | safe}}
-
- {% else %}
-
+ {% else %}
{{p.realtitle(v) | safe}}
- {% endif %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 01bf4133f7..889dbe9889 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -187,6 +187,11 @@
{% if p.club %}
Country Club
{% endif %}
+ {% if p.flair %}
+
+ {{p.flair | safe}}
+
+ {% endif %}
{{p.realtitle(v) | safe}}