diff --git a/src/Peer/Peer.py b/src/Peer/Peer.py
index 60113294..6fa63f60 100644
--- a/src/Peer/Peer.py
+++ b/src/Peer/Peer.py
@@ -115,7 +115,10 @@ class Peer(object):
         return self.connection
 
     def __str__(self):
-        return "Peer:%-12s" % self.ip
+        if self.site:
+            return "Peer:%-12s of %s" % (self.ip, self.site.address_short)
+        else:
+            return "Peer:%-12s" % self.ip
 
     def __repr__(self):
         return "<%s>" % self.__str__()