diff --git a/Netdisco/Changes b/Netdisco/Changes
index b4720e62..a2eb38cc 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -14,6 +14,7 @@
   * Another fix for NetAddr::MAC tripping up on v6 addresses
   * [#191] Fix error when stopping stopped web daemon
   * [#174] LDAP users should not be able to change password
+  * [#182] SSID and PoE showing in wrong Device Port columns
 
 2.030000 - 2015-01-08
 
diff --git a/Netdisco/share/views/ajax/device/ports.tt b/Netdisco/share/views/ajax/device/ports.tt
index f91bf468..97037bcd 100644
--- a/Netdisco/share/views/ajax/device/ports.tt
+++ b/Netdisco/share/views/ajax/device/ports.tt
@@ -209,10 +209,6 @@
       </td>
       [% END %]
 
-      [% IF params.c_ssid %]
-      <td>[% row.ssid.ssid | html_entity %]</td>
-      [% END %]
-
       [% IF params.c_power %]
         [% IF row.power %]
           [% IF row.power.admin == 'true' %]
@@ -255,6 +251,10 @@
         [% END %]
       [% END %]
 
+      [% IF params.c_ssid %]
+      <td>[% row.ssid.ssid | html_entity %]</td>
+      [% END %]
+
       [% IF params.c_nodes OR params.c_neighbors %]
       <td>
         [% IF params.c_neighbors AND (row.remote_ip OR row.is_uplink) %]