diff --git a/Netdisco/Changes b/Netdisco/Changes
index dcb7d0bc..2d09b4e2 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -5,6 +5,8 @@
   * Wildcard support on Device Port MAC Search
   * Wildcard support on Node name/MAC Search
   * User Reports appear in "My Reports" menu if no category is given
+  * Permit clipboard copy of device IP from Job Queue rows
+  * Failed Job Device IPs link to Discover form with pre-filled Discover IP
 
 2.024003 - 2014-02-27
 
diff --git a/Netdisco/share/views/ajax/admintask/jobqueue.tt b/Netdisco/share/views/ajax/admintask/jobqueue.tt
index 81f71d91..77fd4076 100644
--- a/Netdisco/share/views/ajax/admintask/jobqueue.tt
+++ b/Netdisco/share/views/ajax/admintask/jobqueue.tt
@@ -35,8 +35,13 @@
       [% ELSE %]
       <td class="nd_center-cell">[% row.status.ucfirst | html_entity %]</td>
       [% END %]
-      <td class="nd_center-cell"><a class="nd_linkcell"
-        href="[% uri_for('/device') %]?q=[% row.device | uri %]">[% row.device | html_entity %]</a></td>
+      <td class="nd_center-cell">
+        [% IF row.status == 'error' %]
+        <a href="[% uri_for('/') %]?device=[% row.device | uri %]">[% row.device | html_entity %]</a>
+        [% ELSE %]
+        <a href="[% uri_for('/device') %]?q=[% row.device | uri %]">[% row.device | html_entity %]</a>
+        [% END %]
+      </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/index.tt b/Netdisco/share/views/index.tt
index c90d9e32..3a2ccf71 100644
--- a/Netdisco/share/views/index.tt
+++ b/Netdisco/share/views/index.tt
@@ -50,7 +50,7 @@
           [% IF user_has_role('admin') %]
           <form class="nd_login-form" method="post" action="[% uri_for('/admin/discover') %]">
             <div class="form-horizontal">
-              <input placeholder="Device hostname or IP" class="span4" name="device" type="text"/>
+              <input placeholder="Device hostname or IP" class="span4" name="device" value="[% params.device %]" type="text"/>
               <input type="hidden" name="extra" value="with-nodes"/>
               <button type="submit" class="btn btn-info">Discover</button>
             </div>