diff --git a/Netdisco/lib/App/Netdisco/Web/AdminTask.pm b/Netdisco/lib/App/Netdisco/Web/AdminTask.pm
index 736ef0b1..389351d9 100644
--- a/Netdisco/lib/App/Netdisco/Web/AdminTask.pm
+++ b/Netdisco/lib/App/Netdisco/Web/AdminTask.pm
@@ -4,6 +4,8 @@ use Dancer ':syntax';
 use Dancer::Plugin::Ajax;
 use Dancer::Plugin::DBIC;
 
+use Try::Tiny;
+
 sub add_job {
     my ($jobtype, $device) = @_;
 
@@ -13,13 +15,16 @@ sub add_job {
           and $device->addr ne '0.0.0.0';
     }
 
-    schema('netdisco')->resultset('Admin')->create({
-      ($device ? (device => $device->addr) : ()),
-      action => $jobtype,
-      status => 'queued',
-      username => session('user'),
-      userip => request->remote_address,
-    });
+    try {
+    # job might already be in the queue, so this could die
+        schema('netdisco')->resultset('Admin')->create({
+          ($device ? (device => $device->addr) : ()),
+          action => $jobtype,
+          status => 'queued',
+          username => session('user'),
+          userip => request->remote_address,
+        });
+    }
 }
 
 # we have a separate list for jobs needing a device to avoid queueing
diff --git a/Netdisco/share/views/ajax/device/details.tt b/Netdisco/share/views/ajax/device/details.tt
index 4837524b..6fc4fd8c 100644
--- a/Netdisco/share/views/ajax/device/details.tt
+++ b/Netdisco/share/views/ajax/device/details.tt
@@ -99,7 +99,15 @@
       <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>
+          <button type="submit" class="btn btn-info btn-small">Discover</button>
+        </form>
+        <form method="post" class="nd_inline-form" action="[% uri_for('/admin/arpnip') %]">
+          <input type="hidden" value="[% d.ip %]" name="device" type="text"/>
+          <button type="submit" class="btn btn-info btn-small">Arpnip</button>
+        </form>
+        <form method="post" class="nd_inline-form" action="[% uri_for('/admin/macsuck') %]">
+          <input type="hidden" value="[% d.ip %]" name="device" type="text"/>
+          <button type="submit" class="btn btn-info btn-small">Macsuck</button>
         </form>
       </td>
     </tr>