diff --git a/files/templates/submission.html b/files/templates/submission.html
index dbae39b1f1..c95153806a 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -454,8 +454,13 @@
{% endif %}
{% if v.admin_level >=3 %}
-
Remove
- Approve
+ {% if "/flagged/" in request.path %}
+ {% if v.id != p.author.id %}Remove{% endif %}
+ Approve
+ {% else %}
+ {% if v.id != p.author.id %}Remove{% endif %}
+ Approve
+ {% endif %}
{% endif %}
{% if v.id == p.author_id or v.admin_level >= 3 %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 620161dc5e..212e5a1594 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -181,10 +181,10 @@
{% if v.admin_level >=3 %}
{% if "/flagged/" in request.path %}
- Remove
+ {% if v.id != p.author.id %}Remove{% endif %}
Approve
{% else %}
- Remove
+ {% if v.id != p.author.id %}Remove{% endif %}
Approve
{% endif %}
{% endif %}