diff --git a/files/templates/CHRISTMAS/sidebars/SubmissionSidebar.html b/files/templates/CHRISTMAS/sidebars/SubmissionSidebar.html
index dfdd6b0345..1ae381b597 100644
--- a/files/templates/CHRISTMAS/sidebars/SubmissionSidebar.html
+++ b/files/templates/CHRISTMAS/sidebars/SubmissionSidebar.html
@@ -91,12 +91,18 @@
Country Club
{% endif %}
-
- {% if p.stickied %}
+ {% if p.stickied and p.stickied.startswith('t:') %}
-
+
- Pinned {% if p.stickied.startswith('t:') %}until {{p.stickied[2:]}}{% else %}by @{{p.stickied}}{%endif%}
+ Pinned
+
+
+ {% elif p.stickied %}
+
+
+
+ Pinned
{% endif %}
diff --git a/files/templates/CHRISTMAS/submission_listing.html b/files/templates/CHRISTMAS/submission_listing.html
index 698d2a3185..3b62e054de 100644
--- a/files/templates/CHRISTMAS/submission_listing.html
+++ b/files/templates/CHRISTMAS/submission_listing.html
@@ -194,20 +194,18 @@
{% endif %}
- {% if p.stickied %}
+ {% if p.stickied and p.stickied.startswith('t:') %}
-
+
- Pinned {% if p.stickied.startswith('t:') %}until {{p.stickied[2:]}}{% else %}by @{{p.stickied}}{%endif%}
+ Pinned
- {% endif %}
-
- {% if p.is_pinned and request.path.startswith('/@') %}
+ {% elif p.stickied %}
-
+
- Pinned to profile
+ Pinned
{% endif %}