1 files changed, 4 insertions, 6 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 61c7de7ff..8fcfacc9a 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -578,12 +578,10 @@ class Person(Address, OwnPerms) :
         )
 
     def __unicode__(self):
-        lbl = u"%s %s" % (self.name, self.surname)
-        if self.attached_to:
-            lbl += settings.JOINT + unicode(self.attached_to)
-        elif self.email:
-            lbl += settings.JOINT + self.email
-        return lbl
+        values = [unicode(getattr(self, attr))
+                   for attr in ('surname', 'name', 'attached_to')
+                               if getattr(self, attr)]
+        return u" ".join(values)
 
     def full_label(self):
         values = []