diff --git a/templates/libraries/_library_list_item.html b/templates/libraries/_library_list_item.html
index f5ae911f..fb070b9c 100644
--- a/templates/libraries/_library_list_item.html
+++ b/templates/libraries/_library_list_item.html
@@ -11,7 +11,9 @@
                {% endif %}"
       >{{ library.name }}</a>
       {% for author in library.authors.all %}
-      <img src="{{ author.image.url }}" class="inline rounded w-[30px] float-right" alt="{{ author.get_full_name }}" />
+        {% if author.image %}
+          <img src="{{ author.image.url }}" class="inline rounded w-[30px] float-right" alt="{{ author.get_full_name }}" />
+        {% endif %}
       {% endfor %}
     </h3>
   </div>
diff --git a/templates/libraries/detail.html b/templates/libraries/detail.html
index 53698999..ca92c788 100644
--- a/templates/libraries/detail.html
+++ b/templates/libraries/detail.html
@@ -88,7 +88,7 @@
                   {% else %}
                     <i class="mr-2 text-5xl fas fa-user text-white/60"></i>
                   {% endif %}
-                  {{ author.get_full_name }}
+                  {{ author.get_display_name }}
                 </div>
               {% endfor %}
             </div>
@@ -103,7 +103,7 @@
                   {% else %}
                     <i class="mr-2 text-5xl fas fa-user text-white/60"></i>
                   {% endif %}
-                  {{ maintainer.get_full_name }}
+                  {{ maintainer.get_display_name }}
                 </div>
               {% endfor %}
             </div>
diff --git a/templates/users/photo_upload.html b/templates/users/photo_upload.html
index 518ff481..09e518c4 100644
--- a/templates/users/photo_upload.html
+++ b/templates/users/photo_upload.html
@@ -12,7 +12,7 @@
       {% endif %}
     </div>
     <div class="text-sm ml-4">
-      <span class="block">{{ user.get_full_name }}</span>
+      <span class="block">{{ user.get_display_name }}</span>
       <span class="text-slate text-xs">Joined {{ user.date_joined }}</span>
     </div>
   </div>