diff --git a/opentech/apply/users/models.py b/opentech/apply/users/models.py
index 9f820187523aaf6dc4165e0b9855cfdce967590f..1ce86dcbf8a47ea42150b7f7bd38fe0b37472685 100644
--- a/opentech/apply/users/models.py
+++ b/opentech/apply/users/models.py
@@ -63,7 +63,7 @@ class User(AbstractUser):
     objects = UserManager()
 
     def __str__(self):
-        return self.get_full_name()
+        return self.get_full_name() if self.get_full_name() else self.get_short_name()
 
     def get_full_name(self):
         return self.full_name.strip()