diff --git a/src/root/jobset.tt b/src/root/jobset.tt
index 75205214..66f2badf 100644
--- a/src/root/jobset.tt
+++ b/src/root/jobset.tt
@@ -130,12 +130,6 @@
 		<div id="tabs-setup" class="tab-pane [% IF edit %]active[% END %]">
 			<h2>Information</h2>
 			
-			[% IF !edit && c.user_exists %]
-			     <p>
-			         [ <a href="[% c.uri_for('/jobset' project.name jobset.name 'edit') %]">Edit</a> | <a href="[% c.uri_for('/jobset' project.name jobset.name 'clone') %]">Clone</a> ]
-			     </p>
-			[% END %]
-
 			<table class="layoutTable">
 			  [% IF edit %]
 			  <tr>
diff --git a/src/root/topbar.tt b/src/root/topbar.tt
index 5a7a0677..6c822120 100644
--- a/src/root/topbar.tt
+++ b/src/root/topbar.tt
@@ -83,7 +83,7 @@
         title = "Errors" %]
       <li class="divider"></li>
       [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'channel' 'latest') title = "Channel (latest)" %]
-      [% IF c.check_user_roles('admin') %]
+      [% IF c.user_exists %]
           <li class="divider"></li>
           [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'clone') title="Clone jobset" %]
           [% INCLUDE menuItem uri = c.uri_for('/jobset' project.name jobset.name 'edit') title="Edit jobset" %]