diff --git a/src/pictures/models.py b/src/pictures/models.py
index 5d22c95..e6c275a 100644
--- a/src/pictures/models.py
+++ b/src/pictures/models.py
@@ -16,7 +16,7 @@ class Contact(models.Model):
     display_name = models.CharField(max_length=250, blank=True)
 
     def __str__(self):
-        return self.display_name or self.phone_number
+        return self.display_name or str(self.phone_number)
 
 
 class Message(models.Model):
diff --git a/src/pictures/templates/pictures/messages-detail.html b/src/pictures/templates/pictures/messages-detail.html
index af11990..546149f 100644
--- a/src/pictures/templates/pictures/messages-detail.html
+++ b/src/pictures/templates/pictures/messages-detail.html
@@ -13,7 +13,7 @@
 {% block content %}
     <div class="message">
         <div class="metadata">
-            <div class="name">De: {{ message.sender.display_name }}</div>
+            <div class="name">De: {{ message.sender }}</div>
             <div class="date">{{ message.received_at }}</div>
         </div>
         <div class="media">
diff --git a/src/pictures/templates/pictures/messages-list.html b/src/pictures/templates/pictures/messages-list.html
index b53db1e..fef66b1 100644
--- a/src/pictures/templates/pictures/messages-list.html
+++ b/src/pictures/templates/pictures/messages-list.html
@@ -17,7 +17,7 @@
             </div>
             <div class="content-block">
                 <div class="metadata">
-                    <div class="name">De: {{ message.sender.display_name }}</div>
+                    <div class="name">De: {{ message.sender }}</div>
                     <div class="date">{{ message.received_at }}</div>
                 </div>
                 <p class="text">{{ message.content | linebreaks }}</p>