diff --git a/files/templates/CHRISTMAS/comments/CommentActions.html b/files/templates/CHRISTMAS/comments/CommentActions.html
index 76eb7028e7..f6de23d68b 100644
--- a/files/templates/CHRISTMAS/comments/CommentActions.html
+++ b/files/templates/CHRISTMAS/comments/CommentActions.html
@@ -149,7 +149,7 @@
 				</li>
 				{% endif %}
 
-				{% if v and c.post and (v.admin_level > 1 or v.id == c.post.author_id) %}
+				{% if v and c.post %}
 				<li>
 					<hr class="mt-2 mb-1.5 border-t border-black h-1 shadow-inset-t-white-05"/>
 				</li>
diff --git a/files/templates/CHRISTMAS/modals/ModalCommentActions.html b/files/templates/CHRISTMAS/modals/ModalCommentActions.html
index c1a0c17ec2..54a2422fc1 100644
--- a/files/templates/CHRISTMAS/modals/ModalCommentActions.html
+++ b/files/templates/CHRISTMAS/modals/ModalCommentActions.html
@@ -68,17 +68,30 @@
 					</li>
 					{% endif %}
 					{% endif %}
-					{% if v and c.post and (v.admin_level > 1 or v.id == c.post.author_id) %}
-					<li id="pin2-{{c.id}}" class="{% if c.is_pinned %}hidden{% endif %}">
-						<button class="btn btn-gray w-full text-left" onclick="post_toast2('/pin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')">
-							<i class="fas fa-thumbtack fa-rotate--45 fa-fw mr-4"></i>Pin
-						</button>
-					</li>
-					<li id="unpin2-{{c.id}}" class="{% if not c.is_pinned %}hidden{% endif %}">
-						<button class="btn btn-gray w-full text-left" onclick="post_toast2('/pin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')">
-							<i class="fas fa-thumbtack fa-rotate--45 fa-fw mr-4"></i>Unpin
-						</button>
-					</li>
+					{% if v and c.post %}
+						{% if v.admin_level > 1 %}
+						<li id="pin2-{{c.id}}" class="{% if c.is_pinned %}hidden{% endif %}">
+							<button class="btn btn-gray w-full text-left" onclick="post_toast2('/sticky_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')">
+								<i class="fas fa-thumbtack fa-rotate--45 fa-fw mr-4"></i>Pin
+							</button>
+						</li>
+						<li id="unpin2-{{c.id}}" class="{% if not c.is_pinned %}hidden{% endif %}">
+							<button class="btn btn-gray w-full text-left" onclick="post_toast2('/unsticky_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')">
+								<i class="fas fa-thumbtack fa-rotate--45 fa-fw mr-4"></i>Unpin
+							</button>
+						</li>
+						{% elif v.id == c.post.author_id %}
+						<li id="pin2-{{c.id}}" class="{% if c.is_pinned %}hidden{% endif %}">
+							<button class="btn btn-gray w-full text-left" onclick="post_toast2('/pin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')">
+								<i class="fas fa-thumbtack fa-rotate--45 fa-fw mr-4"></i>Pin
+							</button>
+						</li>
+						<li id="unpin2-{{c.id}}" class="{% if not c.is_pinned %}hidden{% endif %}">
+							<button class="btn btn-gray w-full text-left" onclick="post_toast2('/unpin_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}')">
+								<i class="fas fa-thumbtack fa-rotate--45 fa-fw mr-4"></i>Unpin
+							</button>
+						</li>
+						{% endif %}
 					{% endif %}
 					{% if v %}
 						{% if v.admin_level > 0 and v.id==c.author_id %}