diff --git a/plugins/display/track_users.py b/plugins/display/track_users.py
index 8a27fa8..d0fe2f1 100644
--- a/plugins/display/track_users.py
+++ b/plugins/display/track_users.py
@@ -77,7 +77,7 @@ class IWLADisplayTrackUsers(IPlugin):
             for ip in self.tracked_ip:
                 if not ip in hits.keys(): continue
                 if 'dns_name_replaced' in hits[ip].keys():
-                    ip_title = '<b>%s [%s]</b>' % (ip, hits[ip][remote_addr])
+                    ip_title = '<b>%s [%s]</b>' % (hits[ip]['remote_addr'], ip)
                 else:
                     ip_title = '<b>%s</b>' % (ip)
                 table.appendRow([ip_title, ''])
@@ -107,6 +107,8 @@ class IWLADisplayTrackUsers(IPlugin):
         for ip in self.tracked_ip:
             if not ip in hits.keys(): continue
             if 'dns_name_replaced' in hits[ip].keys():
-                ip = '%s [%s]' % (ip, hits[ip][remote_addr])
-            table.appendRow([ip, time.asctime(hits[ip]['last_access'])])
+                ip_title = '%s [%s]' % (hits[ip]['remote_addr'], ip)
+            else:
+                ip_title = ip
+            table.appendRow([ip_title, time.asctime(hits[ip]['last_access'])])
         index.appendBlock(table)