diff --git a/drama/templates/comments.html b/drama/templates/comments.html
index 077bbba08..ae48d6bf8 100644
--- a/drama/templates/comments.html
+++ b/drama/templates/comments.html
@@ -313,9 +313,9 @@
 
 							{% endif %}
 							
-						{% if not v.id==c.author_id %}
-						<a class="dropdown-item text-danger" href="javascript:void(0)" onclick="post_toast('/settings/block?username={{c.author.username}}')"
-						><i class="fas fa-user-slash fa-fw"></i>Block user</a>
+						{% if not v.id==c.author_id and v.admin_level == 0 %}
+							<a class="dropdown-item text-danger" href="javascript:void(0)" onclick="post_toast('/settings/block?username={{c.author.username}}')"
+							><i class="fas fa-user-slash fa-fw"></i>Block user</a>
 						{% endif %}
 
 							{% if v.admin_level>=3 %}
@@ -511,10 +511,10 @@
 								<li class="list-group-item"><a class="d-block" href="{{c.oauth_app.permalink}}/comments"><i class="fas fa-code"></i>API App</a></li>
 							{% endif %}
 
-							{% if not v.id==c.author_id %}
-									<li class="list-group-item">
-										<a class="d-block" href="javascript:void(0)" onclick="post_toast('/settings/block?username={{c.author.username}}')"><i class="fas fa-user-slash"></i>Block user</a>
-									</li>
+							{% if not v.id==c.author_id and v.admin_level == 0 %}
+								<li class="list-group-item">
+									<a class="d-block" href="javascript:void(0)" onclick="post_toast('/settings/block?username={{c.author.username}}')"><i class="fas fa-user-slash"></i>Block user</a>
+								</li>
 							{% endif %}
 					{% endif %}
 						
diff --git a/drama/templates/submission.html b/drama/templates/submission.html
index 63e4c87bc..55308d7e0 100644
--- a/drama/templates/submission.html
+++ b/drama/templates/submission.html
@@ -157,7 +157,7 @@
 
 					{% endif %}
 
-					{% if v and v.id != p.author_id %}
+					{% if v and v.id != p.author_id and v.admin_level == 0 %}
 						<button id="block-user-button-{{p.base36id}}" class="btn btn-link btn-block btn-lg text-left text-danger{% if p.is_blocking %} d-none{% endif %}" data-dismiss="modal" onclick="post_toast('/settings/block?username={{p.author.username}}', callback=function(){document.getElementById('block-user-button-{{p.base36id}}').classList.toggle('d-none');document.getElementById('unblock-user-button-{{p.base36id}}').classList.toggle('d-none');})"
 						><i class="fas fa-user-slash mr-3"></i>Block user</button>
 						<button id="unblock-user-button-{{p.base36id}}" class="btn btn-link btn-block btn-lg text-left text-danger{% if not p.is_blocking %} d-none{% endif %}" data-dismiss="modal" onclick="post_toast('/settings/unblock?username={{p.author.username}}', callback=function(){document.getElementById('block-user-button-{{p.base36id}}').classList.toggle('d-none');document.getElementById('unblock-user-button-{{p.base36id}}').classList.toggle('d-none');})"
@@ -382,7 +382,7 @@
 						<li class="list-inline-item"><a href="{{p.oauth_app.permalink}}" ><i class="fas fa-code"></i>API App</a></li>
 						{% endif %}
 
-						{% if not v.id==p.author_id %}
+						{% if not v.id==p.author_id and v.admin_level == 0 %}
 							<li id="block-user-{{p.base36id}}" class="list-inline-item{% if p.is_blocking %} d-none{% endif %}"><a href="javascript:void(0)" onclick="post_toast('/settings/block?username={{p.author.username}}', callback=function(){document.getElementById('block-user-{{p.base36id}}').classList.toggle('d-none');document.getElementById('unblock-user-{{p.base36id}}').classList.toggle('d-none');})"
 							><i class="fas fa-user-slash text-danger"></i>Block user</a></li>
 							<li id="unblock-user-{{p.base36id}}" class="list-inline-item{% if not p.is_blocking %} d-none{% endif %}"><a href="javascript:void(0)" onclick="post_toast('/settings/unblock?username={{p.author.username}}', callback=function(){document.getElementById('block-user-{{p.base36id}}').classList.toggle('d-none');document.getElementById('unblock-user-{{p.base36id}}').classList.toggle('d-none');})"
diff --git a/drama/templates/submission_listing.html b/drama/templates/submission_listing.html
index 5825d3514..15d8ca09e 100644
--- a/drama/templates/submission_listing.html
+++ b/drama/templates/submission_listing.html
@@ -216,7 +216,7 @@
 								<li class="list-inline-item"><a href="{{p.oauth_app.permalink}}" ><i class="fas fa-code"></i>API App</a></li>
 							{% endif %}
 
-							{% if not v.id==p.author_id %}
+							{% if not v.id==p.author_id and v.admin_level == 0 %}
 								<li id="block-user-{{p.base36id}}" class="list-inline-item {% if p.is_blocking %} d-none{% endif %}"><a href="javascript:void(0)" onclick="post_toast('/settings/block?username={{p.author.username}}', callback=function(){window.location.reload(true);})"><i class="fas fa-user-slash"></i>Block user</a></li>
 								<li id="unblock-user-{{p.base36id}}" class="list-inline-item {% if not p.is_blocking %} d-none{% endif %}"><a href="javascript:void(0)" onclick="post_toast('/settings/unblock?username={{p.author.username}}', callback=function(){window.location.reload(true);})"><i class="fas fa-user-slash"></i>Unblock user</a></li>
 							{% endif %}
@@ -395,7 +395,7 @@
 
 					{% endif %}
 
-					{% if v and not v.id==p.author_id %}
+					{% if v and not v.id==p.author_id and v.admin_level == 0 %}
 						<button id="block-user-button-{{p.base36id}}" class="btn btn-link btn-block btn-lg text-left text-danger{% if p.is_blocking %} d-none{% endif %}" data-dismiss="modal" onclick="post_toast('/settings/block?username={{p.author.username}}', callback=function(){window.location.reload(true);})"
 						><i class="fas fa-user-slash mr-3"></i>Block user</button>
 						<button id="unblock-user-button-{{p.base36id}}" class="btn btn-link btn-block btn-lg text-left text-danger{% if not p.is_blocking %} d-none{% endif %}" data-dismiss="modal" onclick="post_toast('/settings/unblock?username={{p.author.username}}', callback=function(){window.location.reload(true);})"