diff --git a/files/routes/admin.py b/files/routes/admin.py
index 1cb4cf23c..458cac1a3 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -839,7 +839,8 @@ def unagendaposter(user_id, v):
 @admin_level_required(PERMS['USER_SHADOWBAN'])
 def shadowban(user_id, v):
 	user = get_account(user_id)
-	if user.admin_level != 0: abort(403)
+	if user.admin_level > v.admin_level:
+		abort(403)
 	user.shadowbanned = v.username
 	reason = request.values.get("reason").strip()[:256]
 	user.ban_reason = reason
@@ -886,7 +887,7 @@ def unshadowban(user_id, v):
 	
 	cache.delete_memoized(frontlist)
 
-	return redirect(user.url)
+	return {"message": f"@{user.username} has been unshadowbanned!"}
 
 
 @app.post("/admin/title_change/<user_id>")
diff --git a/files/templates/userpage_admintools.html b/files/templates/userpage_admintools.html
index 11a141a3e..ce74cb4ff 100644
--- a/files/templates/userpage_admintools.html
+++ b/files/templates/userpage_admintools.html
@@ -57,22 +57,17 @@
 				</form>
 			{% endif %}
 			{% if v.admin_level >= PERMS['USER_SHADOWBAN'] %}
-				{% if u.shadowbanned %}
-					<form class="mb-3" action="/unshadowban/{{u.id}}" method="post">
-						<input type="hidden" name="formkey" value="{{v.formkey}}">
-						<input type="submit" onclick="disable(this)" class="btn btn-success" value="Unshadowban user">
-					</form>
-				{% else %}
-					<form class="mb-3" action="/shadowban/{{u.id}}" method="post">
-						<input type="hidden" name="formkey" value="{{v.formkey}}">
-						<input autocomplete="off" style="font-size:11px" type="text" class="form-control" maxlength="256" name="reason" placeholder="Shadowban Reason" oninput="document.getElementById('user-shadowban-submit-{{deviceType}}').disabled=false" required>
-						<div class="custom-control custom-checkbox mb-1">
-							<input autocomplete="off" type="checkbox" id="shadowban-alts-{{deviceType}}" class="custom-control-input" name="alts" value="1">
-							<label class="custom-control-label" for="shadowban-alts-{{deviceType}}">Include alts</label>
-						</div>
-						<input autocomplete="off" id="user-shadowban-submit-{{deviceType}}" type="submit" onclick="disable(this)" class="btn btn-danger" value="Shadowban user" disabled>
-					</form>
-				{% endif %}
+				<button type="button" id="unshadowban-{{deviceType}}" class="mt-1 mb-3 {% if not u.shadowbanned %}d-none{% endif %} btn btn-success" onclick="postToastSwitch(this,'/unshadowban/{{u.id}}','shadowban-{{deviceType}}','unshadowban-{{deviceType}}','d-none')">Unshadowban user</button>
+
+				<form id="shadowban-{{deviceType}}" class="mb-3 {% if u.shadowbanned %}d-none{% endif %}" action="/shadowban/{{u.id}}" method="post">
+					<input type="hidden" name="formkey" value="{{v.formkey}}">
+					<input autocomplete="off" style="font-size:11px" type="text" class="form-control" maxlength="256" name="reason" placeholder="Shadowban Reason" oninput="document.getElementById('user-shadowban-submit-{{deviceType}}').disabled=false" required>
+					<div class="custom-control custom-checkbox mb-1">
+						<input autocomplete="off" type="checkbox" id="shadowban-alts-{{deviceType}}" class="custom-control-input" name="alts" value="1">
+						<label class="custom-control-label" for="shadowban-alts-{{deviceType}}">Include alts</label>
+					</div>
+					<input autocomplete="off" id="user-shadowban-submit-{{deviceType}}" type="submit" onclick="disable(this)" class="btn btn-danger" value="Shadowban user" disabled>
+				</form>
 			{% endif %}
 			{% if v.admin_level >= PERMS['USER_AGENDAPOSTER'] %}
 				<form id="agendaposter-{{deviceType}}" class="{% if u.agendaposter %}d-none{% endif %}" action="/agendaposter/{{u.id}}" method="post">