diff --git a/Netdisco/share/public/css/netdisco.css b/Netdisco/share/public/css/netdisco.css
index 81157113..cc685b54 100644
--- a/Netdisco/share/public/css/netdisco.css
+++ b/Netdisco/share/public/css/netdisco.css
@@ -107,6 +107,11 @@ td div.input-append {
   margin-bottom: 0px;
 }
 
+/* admin buttons in the device details view */
+td > form.nd_inline-form {
+  margin-bottom: 2px;
+}
+
 /* fix layout of form fields inside the (pseudo devices) table */
 .nd_center-cell input {
   margin-bottom: 0px;
diff --git a/Netdisco/share/views/ajax/admintask/jobqueue.tt b/Netdisco/share/views/ajax/admintask/jobqueue.tt
index 56ade7fd..0387d425 100644
--- a/Netdisco/share/views/ajax/admintask/jobqueue.tt
+++ b/Netdisco/share/views/ajax/admintask/jobqueue.tt
@@ -32,7 +32,7 @@
       <td class="nd_center-cell">[% row.status.ucfirst | html_entity %]</td>
       [% END %]
       <td class="nd_center-cell"><a class="nd_linkcell"
-        href="[% device_ports %]&q=[% row.device | uri %]">[% row.device | html_entity %]</a></td>
+        href="[% uri_for('/device') %]?q=[% row.device | uri %]">[% row.device | html_entity %]</a></td>
       <td class="nd_center-cell">[% row.port | html_entity %]</td>
       <td class="nd_center-cell">[% row.subaction | html_entity %]</td>
       <td class="nd_center-cell">[% row.username | html_entity %]</td>
diff --git a/Netdisco/share/views/ajax/admintask/pseudodevice.tt b/Netdisco/share/views/ajax/admintask/pseudodevice.tt
index 900ecf8a..60b4f69c 100644
--- a/Netdisco/share/views/ajax/admintask/pseudodevice.tt
+++ b/Netdisco/share/views/ajax/admintask/pseudodevice.tt
@@ -22,7 +22,7 @@
     <tr>
       <form name="update">
       <td class="nd_center-cell"><a class="nd_linkcell"
-        href="[% device_ports %]&q=[% row.dns | uri %]">[% row.dns | html_entity %]</a></td>
+        href="[% uri_for('/device') %]?q=[% row.dns | uri %]">[% row.dns | html_entity %]</a></td>
       <td class="nd_center-cell">[% row.ip | html_entity %]</td>
       <td class="nd_center-cell"><input name="ports" type="number" value="[% row.port_count | html_entity %]"></td>
       <td class="nd_center-cell">
diff --git a/Netdisco/share/views/ajax/admintask/topology.tt b/Netdisco/share/views/ajax/admintask/topology.tt
index ab180fbb..a8e52084 100644
--- a/Netdisco/share/views/ajax/admintask/topology.tt
+++ b/Netdisco/share/views/ajax/admintask/topology.tt
@@ -44,10 +44,10 @@
     <tr>
       <form name="del">
       <td class="nd_center-cell"><a class="nd_linkcell"
-        href="[% device_ports %]&q=[% row.dev1 | uri %]">[% row.dev1 | html_entity %]</a></td>
+        href="[% uri_for('/device') %]?q=[% row.dev1 | uri %]">[% row.dev1 | html_entity %]</a></td>
       <td class="nd_center-cell">[% row.port1 | html_entity %]</td>
       <td class="nd_center-cell"><a class="nd_linkcell"
-        href="[% device_ports %]&q=[% row.dev2 | uri %]">[% row.dev2 | html_entity %]</a></td>
+        href="[% uri_for('/device') %]?q=[% row.dev2 | uri %]">[% row.dev2 | html_entity %]</a></td>
       <td class="nd_center-cell">[% row.port2 | html_entity %]</td>
       <td class="nd_center-cell">
         <input name="dev1" type="hidden" value="[% row.dev1 | html_entity %]">
diff --git a/Netdisco/share/views/ajax/device/details.tt b/Netdisco/share/views/ajax/device/details.tt
index 3f1da1ea..4837524b 100644
--- a/Netdisco/share/views/ajax/device/details.tt
+++ b/Netdisco/share/views/ajax/device/details.tt
@@ -93,5 +93,16 @@
       <td>VTP Domain</td>
       <td>[% d.vtp_domain | html_entity %]</td>
     </tr>
+    [% IF vars.user.admin %]
+    <tr>
+      <td>Admin Tasks</td>
+      <td>
+        <form method="post" class="nd_inline-form" action="[% uri_for('/admin/discover') %]">
+          <input type="hidden" value="[% d.ip %]" name="device" type="text"/>
+          <button type="submit" class="btn btn-info btn-small">Rediscover</button>
+        </form>
+      </td>
+    </tr>
+    [% END %]
   </tbody>
 </table>