diff --git a/Changes b/Changes
index a9b732f0..215527b5 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+2.036007 - 2017-07-12
+
+  [BUG FIXES]
+
+  * fix bugs with Pseudo and Duplicate Device delete (causing web crash)
+
 2.036006 - 2017-07-09
 
   [ENHANCEMENTS]
diff --git a/lib/App/Netdisco/Web/AdminTask.pm b/lib/App/Netdisco/Web/AdminTask.pm
index 4b4931cb..01db3408 100644
--- a/lib/App/Netdisco/Web/AdminTask.pm
+++ b/lib/App/Netdisco/Web/AdminTask.pm
@@ -44,7 +44,7 @@ foreach my $action (@{ setting('job_prio')->{high} },
     };
 }
 
-ajax '/ajax/control/admin/delete' => require_role admin => sub {
+ajax qr{/ajax/control/admin/(?:\w+/)?delete} => require_role admin => sub {
     send_error('Missing device', 400) unless param('device');
 
     my $device = NetAddr::IP->new(param('device'));
diff --git a/lib/App/Netdisco/Web/Plugin/AdminTask/DuplicateDevices.pm b/lib/App/Netdisco/Web/Plugin/AdminTask/DuplicateDevices.pm
index bd50dc9f..5c808c47 100644
--- a/lib/App/Netdisco/Web/Plugin/AdminTask/DuplicateDevices.pm
+++ b/lib/App/Netdisco/Web/Plugin/AdminTask/DuplicateDevices.pm
@@ -12,12 +12,6 @@ register_admin_task({
   label => 'Duplicate Devices',
 });
 
-ajax '/ajax/control/admin/duplicatedevices/delete' => require_role admin => sub {
-    my $ip = NetAddr::IP::Lite->new(param('ip'));
-    send_error('Bad Request', 400) unless ($ip and $ip->addr ne '0.0.0.0');
-    forward '/ajax/control/admin/delete', { device => param('ip') };
-};
-
 ajax '/ajax/content/admin/duplicatedevices' => require_role admin => sub {
     my @set = schema('netdisco')->resultset('Device')->search({
       serial => { '-in' => schema('netdisco')->resultset('Device')->search({
diff --git a/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm b/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm
index d3a1c641..fc60c47e 100644
--- a/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm
+++ b/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm
@@ -54,11 +54,6 @@ ajax '/ajax/control/admin/pseudodevice/add' => require_role admin => sub {
     });
 };
 
-ajax '/ajax/control/admin/pseudodevice/del' => require_role admin => sub {
-    send_error('Bad Request', 400) unless _sanity_ok();
-    forward '/ajax/control/admin/delete', { device => param('ip') };
-};
-
 ajax '/ajax/control/admin/pseudodevice/update' => require_role admin => sub {
     send_error('Bad Request', 400) unless _sanity_ok();
 
diff --git a/share/views/ajax/admintask/duplicatedevices.tt b/share/views/ajax/admintask/duplicatedevices.tt
index f843d438..ec654be6 100644
--- a/share/views/ajax/admintask/duplicatedevices.tt
+++ b/share/views/ajax/admintask/duplicatedevices.tt
@@ -56,7 +56,7 @@
               <input id="nd_devdel-archive" type="checkbox" data-form="delete" name="archive">
               <h4 class="nd_unbolden">Archive Nodes</h4>
             </label>
-            <input type="hidden" data-form="delete" value="[% row.ip | html_entity %]" name="ip"/>
+            <input type="hidden" data-form="delete" value="[% row.ip | html_entity %]" name="device"/>
           </div>
           <div class="modal-footer">
             <button class="btn btn-success" data-dismiss="modal" aria-hidden="true">Cancel</button>
diff --git a/share/views/ajax/admintask/pseudodevice.tt b/share/views/ajax/admintask/pseudodevice.tt
index 51e6ee56..a781c27f 100644
--- a/share/views/ajax/admintask/pseudodevice.tt
+++ b/share/views/ajax/admintask/pseudodevice.tt
@@ -45,13 +45,11 @@
               <p class="text-info">
                 Pseudo-device &quot;[% row.dns | html_entity %] / [% row.ip | html_entity %]&quot; will be deleted.</p>
             </blockquote>
-            <input data-form="del" name="dns" type="hidden" value="[% row.dns | html_entity %]">
-            <input data-form="del" name="ip" type="hidden" value="[% row.ip | html_entity %]">
-            <input data-form="del" name="ports" type="hidden" value="[% row.port_count | html_entity %]">
+            <input data-form="delete" name="device" type="hidden" value="[% row.ip | html_entity %]">
           </div>
           <div class="modal-footer">
             <button class="btn btn-success" data-dismiss="modal" aria-hidden="true">Cancel</button>
-            <button class="btn btn-danger nd_adminbutton" name="del" data-dismiss="modal">Confirm</button>
+            <button class="btn btn-danger nd_adminbutton" name="delete" data-dismiss="modal">Confirm</button>
           </div>
         </div>
       </td>