1 files changed, 5 insertions, 1 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index fd0de385e..5384c160a 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -1776,7 +1776,11 @@ class Organization(Address, Merge, OwnPerms, ValueGetter):
         )
 
     def __unicode__(self):
-        return self.name
+        if self.name:
+            return self.name
+        return u"{} - {} - {}".format(self.organization_type,
+                                      self.address or "",
+                                      self.town or "")
 
     def generate_merge_key(self):
         self.merge_key = slugify(self.name if self.name else '')