diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm
index 7e723bf3..77000540 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Report/PortAdminDown.pm
@@ -17,22 +17,21 @@ register_report(
 get '/ajax/content/report/portadmindown' => require_login sub {
     my @results = schema('netdisco')->resultset('Device')->search(
         { 'up_admin' => 'down' },
-        {   result_class => 'DBIx::Class::ResultClass::HashRefInflator',
-            select       => [ 'ip', 'dns', 'name' ],
+        {   select       => [ 'ip', 'dns', 'name' ],
             join       => [ 'ports' ],
             '+columns' => [
                 { 'port'        => 'ports.port' },
                 { 'description' => 'ports.name' },
                 { 'up_admin'    => 'ports.up_admin' },
-            ],
-            order_by => { -asc => [qw/me.ip ports.port/] },
+            ]
         }
-    )->all;
+    )->hri->all;
 
     return unless scalar @results;
 
     if ( request->is_ajax ) {
-        template 'ajax/report/portadmindown.tt', { results => \@results, },
+        my $results = to_json (\@results);
+        template 'ajax/report/portadmindown.tt', { results => $results, },
             { layout => undef };
     }
     else {
diff --git a/Netdisco/share/views/ajax/report/portadmindown.tt b/Netdisco/share/views/ajax/report/portadmindown.tt
index 64fd58d2..3782f2c7 100644
--- a/Netdisco/share/views/ajax/report/portadmindown.tt
+++ b/Netdisco/share/views/ajax/report/portadmindown.tt
@@ -1,23 +1,42 @@
 [% USE Number.Format %]
-<table class="table table-bordered table-condensed table-striped nd_floatinghead">
+<table id="data-table" class="table table-striped table-bordered" width="100%" cellspacing="0">
   <thead>
     <tr>
       <th>Device</th>
-      <th class="nd_center-cell">Port</th>
-      <th class="nd_center-cell">Port Description</th>      
-      <th class="nd_center-cell">Admin Status</th>
+      <th>Port</th>
+      <th>Port Description</th>      
+      <th>Admin Status</th>
     </tr>
   </thead>
-  </tbody>
-    [% FOREACH row IN results %]
-    <tr>
-      <td>[% row.dns || row.name || row.ip | html_entity %]</td>
-      <td class="nd_center-cell"><a href="[% device_ports %]&q=[% row.ip | uri %]&f=[% row.port | uri %]&c_nodes=on">
-               [% row.port | html_entity %]</a></td>
-      <td class="nd_center-cell">[% row.description | html_entity %]</td>
-      <td class="nd_center-cell">[% row.up_admin | html_entity %]</td>
-    </tr>
-    [% END %]
-  </tbody>
 </table>
 
+<script type="text/javascript">
+$(document).ready(function() {
+    var table = $('#data-table').dataTable({
+        "deferRender": true,
+        "order": [[ 0, "asc" ], [1, "asc"]],
+        "data": [% results %],
+        "columns": [
+            {
+                "data": 'ip',
+                "render": function(data, type, row, meta) {
+                    return (row.dns || row.name || row.ip);
+                }
+            }, {
+                "data": 'port',
+                "render": function(data, type, row, meta) {
+                    return '<a href="[% device_ports %]&q=' + row.ip + '&f=' + data + '&c_nodes=on">' + data + '</a>';
+                }
+            }, {
+                "data": 'description'
+            }, {
+                "data": 'up_admin',
+                "orderable": false,
+                "searchable": false,
+            }
+        ]
+    });
+
+});
+</script>
+