diff --git a/app/templates/admin/tickets.html b/app/templates/admin/tickets.html
index cc2fdca..a599a8d 100644
--- a/app/templates/admin/tickets.html
+++ b/app/templates/admin/tickets.html
@@ -56,9 +56,6 @@
       <i class="bi bi-collection me-2"></i>Tickets
       <span style="font-size:12px;color:var(--muted);font-family:'Space Mono',monospace;">({{ tickets.total }})</span>
     </div>
-    <a href="{{ url_for('tickets.create_ticket_behalf') }}" class="btn btn-primary btn-sm">
-      <i class="bi bi-person-plus me-1"></i>File on Behalf
-    </a>
   </div>
   <div class="card-body p-0">
     {% if tickets.items %}
diff --git a/app/templates/tickets/create_behalf.html b/app/templates/tickets/create_behalf.html
index d0855e4..4b95c9b 100644
--- a/app/templates/tickets/create_behalf.html
+++ b/app/templates/tickets/create_behalf.html
@@ -141,7 +141,7 @@
             <button type="submit" class="btn btn-primary" id="submit-btn">
               <i class="bi bi-send me-2"></i>Submit Ticket
             </button>
-            <a href="{{ url_for('admin.all_tickets') }}" class="btn btn-secondary">Cancel</a>
+            <a href="{{ url_for('tickets.ticket_list') }}" class="btn btn-secondary">Cancel</a>
           </div>
         </form>
       </div>
diff --git a/app/templates/tickets/list.html b/app/templates/tickets/list.html
index a192c6b..4a045be 100644
--- a/app/templates/tickets/list.html
+++ b/app/templates/tickets/list.html
@@ -53,9 +53,16 @@
       Tickets
       <span style="font-size:12px;color:var(--muted);font-family:'Space Mono',monospace;">({{ tickets.total }})</span>
     </span>
-    <a href="{{ url_for('tickets.create_ticket') }}" class="btn btn-primary btn-sm">
-      <i class="bi bi-plus-lg me-1"></i>New Ticket
-    </a>
+    <div class="d-flex gap-2">
+      {% if current_user.is_it_staff %}
+      <a href="{{ url_for('tickets.create_ticket_behalf') }}" class="btn btn-secondary btn-sm">
+        <i class="bi bi-person-plus me-1"></i>File on Behalf
+      </a>
+      {% endif %}
+      <a href="{{ url_for('tickets.create_ticket') }}" class="btn btn-primary btn-sm">
+        <i class="bi bi-plus-lg me-1"></i>New Ticket
+      </a>
+    </div>
   </div>
   <div class="card-body p-0">
     {% if tickets.items %}