diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/Device/Ports.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/Device/Ports.pm
index a083be99..12ac58a7 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/Device/Ports.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/Device/Ports.pm
@@ -77,7 +77,7 @@ ajax '/ajax/content/device/ports' => sub {
     template 'ajax/device/ports.tt', {
       results => $results,
       nodes => $nodes_name,
-      device => $device->ip,
+      device => $device,
     }, { layout => undef };
 };
 
diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index 45b7d990..c515df9f 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -43,13 +43,13 @@
       [% IF vars.user.port_control AND params.c_admin %]
       [% IF row.up_admin == 'up' %]
       <td nowrap class="nd_editable-cell" data-action="down"
-        data-field="c_port" data-for-device="[% device | html_entity %]" data-for-port="[% row.port | html_entity %]">
+        data-field="c_port" data-for-device="[% device.ip | html_entity %]" data-for-port="[% row.port | html_entity %]">
         <i class="icon-hand-down nd_hand-icon"
           rel="tooltip" data-placement="top" data-offset="3"
           data-animation="" data-title="Click to Disable"></i>
       [% ELSE %]
       <td nowrap class="nd_editable-cell" data-action="up"
-        data-field="c_port" data-for-device="[% device | html_entity %]" data-for-port="[% row.port | html_entity %]">
+        data-field="c_port" data-for-device="[% device.ip | html_entity %]" data-for-port="[% row.port | html_entity %]">
         <i class="icon-hand-up nd_hand-icon"
           rel="tooltip" data-placement="top" data-offset="3"
           data-animation="" data-title="Click to Enable"></i>
@@ -97,7 +97,7 @@
       [% IF params.c_name %]
       [% IF vars.user.port_control AND params.c_admin %]
       <td nowrap class="nd_editable-cell" contenteditable="true"
-          data-field="c_name" data-for-device="[% device | html_entity %]" data-for-port="[% row.port | html_entity %]">
+          data-field="c_name" data-for-device="[% device.ip | html_entity %]" data-for-port="[% row.port | html_entity %]">
       <i class="icon-edit nd_edit-icon"></i>
       [% ELSE %]
       <td nowrap>
@@ -123,7 +123,7 @@
       [% IF params.c_vlan %]
       [% IF vars.user.port_control AND params.c_admin %]
       <td class="nd_editable-cell" contenteditable="true"
-        data-field="c_vlan" data-for-device="[% device | html_entity %]" data-for-port="[% row.port | html_entity %]">
+        data-field="c_vlan" data-for-device="[% device.ip | html_entity %]" data-for-port="[% row.port | html_entity %]">
       <i class="icon-edit nd_edit-icon"></i>
       <div class="nd_editable-cell-content">
         [% IF row.vlan %][% row.vlan | html_entity %][% END %]
@@ -164,7 +164,7 @@
           [% IF row.power.admin == 'true' %]
             [% IF vars.user.port_control AND params.c_admin %]
               <td nowrap data-action="false"
-                data-field="c_power" data-for-device="[% device | html_entity %]"
+                data-field="c_power" data-for-device="[% device.ip | html_entity %]"
                 data-for-port="[% row.port | html_entity %]">
 
                 <i class="icon-off nd_power-icon nd_power-on"
@@ -184,7 +184,7 @@
           [% ELSE %]
             [% IF vars.user.port_control AND params.c_admin %]
               <td nowrap data-action="true"
-                data-field="c_power" data-for-device="[% device | html_entity %]"
+                data-field="c_power" data-for-device="[% device.ip | html_entity %]"
                 data-for-port="[% row.port | html_entity %]">
 
                 <i class="icon-off nd_power-icon"
diff --git a/Netdisco/share/views/plugin/device_port_column/c_observiumsparklines.tt b/Netdisco/share/views/plugin/device_port_column/c_observiumsparklines.tt
index ee893299..a9ce0ff8 100644
--- a/Netdisco/share/views/plugin/device_port_column/c_observiumsparklines.tt
+++ b/Netdisco/share/views/plugin/device_port_column/c_observiumsparklines.tt
@@ -1,2 +1,2 @@
 <!-- not yet a hyperlink as observium does not support device details page by device-name -->
-<img src="http://[% settings.plugin_c_observiumsparklines.webhost | html_entity %]/graph.php?type=port_bits&device=[% device | uri %]&port=[% row.port | uri %]&from=-1d&to=now&width=100&height=20&legend=no"/>
+<img src="http://[% settings.plugin_observiumsparklines.webhost | html_entity %]/graph.php?type=port_bits&device=[% device.dns | uri %]&port=[% row.port | uri %]&from=-1d&to=now&width=100&height=20&legend=no"/>