diff --git a/src/backoffice/templates/approve_public_credit_names.html b/src/backoffice/templates/approve_public_credit_names.html
index 2bebe16db..307ea997b 100644
--- a/src/backoffice/templates/approve_public_credit_names.html
+++ b/src/backoffice/templates/approve_public_credit_names.html
@@ -19,17 +19,15 @@ <h2>Approve Public Credit Names</h2>
     <table class="table table-hover datatable">
       <thead>
         <tr>
-          <th>Username</th>
-          <th>Email</th>
-          <th>Public Credit Name</th>
+          <th>Private name</th>
+          <th>Public credit name</th>
           <th>Actions</th>
         </tr>
       </thead>
       <tbody>
         {% for profile in profiles %}
           <tr>
-            <td>{{ profile.user.username }}</td>
-            <td>{{ profile.user.email }}</td>
+            <td>{{ profile.private_name }}</td>
             <td>{{ profile.public_credit_name }}</td>
             <td>
               <a href="/admin/profiles/profile/{{ profile.pk }}/change/" class="btn btn-success">Open In Admin</a>
diff --git a/src/backoffice/templates/facilityfeedback_backoffice.html b/src/backoffice/templates/facilityfeedback_backoffice.html
index b59f9f967..0fe0945d4 100644
--- a/src/backoffice/templates/facilityfeedback_backoffice.html
+++ b/src/backoffice/templates/facilityfeedback_backoffice.html
@@ -16,36 +16,38 @@ <h3 class="card-title">Facility Feedback for {{ team.name }} Team ({{ feedback_l
         <form method="post">
           {{ formset.management_form }}
           {% csrf_token %}
-          {% for form, feedback in formset|zip:feedback_list %}
+          {% for form in formset %}
             <div class="card">
               <div class="card-header">
-                <h4 class="card-title">Feedback for {{ feedback.facility.name }} by {{ feedback.user.profile.public_credit_name|default:"Anonymous User" }}</h4>
+                <h4 class="card-title">
+                  Feedback for {{ form.instance.facility.name }} by {{ form.instance.user.profile.public_name|default:'Anonymous user' }}
+                </h4>
               </div>
               <div class="card-body">
                 <table class="table">
                   <tr>
-                    <th>Username</th>
-                    <td>{{ feedback.user }}</td>
+                    <th>User</th>
+                    <td>{{ form.instance.user.profile.private_name|default:'Anonymous user' }}</td>
                   </tr>
                   <tr>
                     <th>Created</th>
-                    <td>{{ feedback.created }}</td>
+                    <td>{{ form.instance.created }}</td>
                   </tr>
                   <tr>
                     <th>Facility</th>
-                    <td>{{ feedback.facility }}</td>
+                    <td>{{ form.instance.facility }}</td>
                   </tr>
                   <tr>
                     <th>Quick Feedback</th>
-                    <td><i class="{{ feedback.quick_feedback.icon }} fa-2x"></i> {{ feedback.quick_feedback }}</td>
+                    <td><i class="{{ form.instance.quick_feedback.icon }} fa-2x"></i> {{ form.instance.quick_feedback }}</td>
                   </tr>
                   <tr>
                     <th>Comment</th>
-                    <td>{{ feedback.comment|default:"N/A" }}</td>
+                    <td>{{ form.instance.comment|default:"N/A" }}</td>
                   </tr>
                   <tr>
                     <th>Urgent</th>
-                    <td class="{% if feedback.urgent %}text-bg-danger{% endif %}">{{ feedback.urgent|yesno }}</td>
+                    <td class="{% if form.instance.urgent %}text-bg-danger{% endif %}">{{ form.instance.urgent|yesno }}</td>
                   </tr>
                   <tr>
                     <th>Handled</th>
diff --git a/src/backoffice/templates/feedback_detail.html b/src/backoffice/templates/feedback_detail.html
index 50c22010d..1acc12270 100644
--- a/src/backoffice/templates/feedback_detail.html
+++ b/src/backoffice/templates/feedback_detail.html
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load profile_display %}
 
 {% block title %}
   Event Feedback Detail | Orga | BackOffice | {{ block.super }}
@@ -16,7 +17,7 @@ <h3 class="card-title">Event Feedback detail</h3>
             <p>{{ feedback.feedback }}</p>
           </blockquote>
           <figcaption class="blockquote-footer">
-            <cite title="Source Title">{{ feedback.user.profile.public_credit_name }}</cite>
+            <cite title="Source Title">{% display_name feedback.user.profile %}</cite>
           </figcaption>
         </figure>
       </div>
diff --git a/src/backoffice/templates/feedback_list.html b/src/backoffice/templates/feedback_list.html
index 6c5c26956..3afe7ae56 100644
--- a/src/backoffice/templates/feedback_list.html
+++ b/src/backoffice/templates/feedback_list.html
@@ -20,8 +20,8 @@ <h2>Event Feedback List</h2>
     <table class="table table-hover datatable">
       <thead>
         <tr>
-          <th>Username</th>
-          <th>Public Credit Name</th>
+          <th>Private name</th>
+          <th>Public credit name</th>
           <th>Feedback</th>
           <th>Processed at</th>
           <th>Processed by</th>
@@ -31,8 +31,8 @@ <h2>Event Feedback List</h2>
       <tbody>
         {% for feedback in object_list %}
           <tr>
-            <td>{{ feedback.user.username }}</td>
-            <td>{{ feedback.user.profile.public_credit_name }}</td>
+            <td>{{ feedback.user.profile.private_name }}</td>
+            <td>{{ feedback.user.profile.public_name }}</td>
             <td>{{ feedback.feedback|truncatewords:12 }}</td>
             <td>{{ feedback.processed_at|default_if_none:"" }}</td>
             <td>{{ feedback.processed_by|default_if_none:"" }}</td>
diff --git a/src/backoffice/templates/feedback_list_processed_confirm.html b/src/backoffice/templates/feedback_list_processed_confirm.html
index 630d9ddd0..bf4c9e4c3 100644
--- a/src/backoffice/templates/feedback_list_processed_confirm.html
+++ b/src/backoffice/templates/feedback_list_processed_confirm.html
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load profile_display %}
 
 {% block title %}
   Confirm Event Feedback Processed | {{ block.super }}
@@ -16,7 +17,7 @@ <h3 class="card-title">Mark event feedback as processed</h3>
             <p>{{ feedback.feedback }}</p>
           </blockquote>
           <figcaption class="blockquote-footer">
-            <cite title="Source Title">{{ feedback.user.profile.public_credit_name }}</cite>
+            <cite title="Source Title">{% display_name feedback.user.profile %}</cite>
           </figcaption>
         </figure>
       </div>
diff --git a/src/backoffice/templates/includes/invoice_list_panel.html b/src/backoffice/templates/includes/invoice_list_panel.html
index 903130c09..71b1f705f 100644
--- a/src/backoffice/templates/includes/invoice_list_panel.html
+++ b/src/backoffice/templates/includes/invoice_list_panel.html
@@ -1,4 +1,6 @@
 {% load bornhack %}
+{% load profile_display %}
+
 {% if invoice_list %}
   <table class="table table-hover datatable">
     <thead>
@@ -16,7 +18,7 @@
       {% for invoice in invoice_list %}
         <tr>
           <td>{{ invoice.id }}</td>
-          <td>{% if invoice.order %}{{ invoice.order.user.username }} &lt;{{ invoice.order.user.email }}&gt;{% else %}{{ invoice.customorder.customer }}{% endif %}</td>
+          <td>{% if invoice.order %}{% display_name invoice.order.user.profile %} &lt;{{ invoice.order.user.email }}&gt;{% else %}{{ invoice.customorder.customer }}{% endif %}</td>
           <td data-order="{{ invoice.created|sortable }}">{{ invoice.created|date }}</td>
           <td data-order="{% if invoice.order %}{{ invoice.order.total }}{% else %}{{ invoice.customorder.amount }}{% endif %}">{% if invoice.order %}{{ invoice.order.total }}{% else %}{{ invoice.customorder.amount }}{% endif %}&nbsp;DKK</td>
           <td>{{ invoice.get_order }}</td>
diff --git a/src/backoffice/templates/includes/posreport_list_table.html b/src/backoffice/templates/includes/posreport_list_table.html
index 9a860a2cf..ad63323d6 100644
--- a/src/backoffice/templates/includes/posreport_list_table.html
+++ b/src/backoffice/templates/includes/posreport_list_table.html
@@ -19,10 +19,10 @@
       <tr>
         <td data-order="{{ pr.period.lower|sortable }}"><a href="{% url 'backoffice:posreport_detail' camp_slug=camp.slug pos_slug=pos.slug posreport_uuid=pr.uuid %}">{{ pr.period.lower }} - {{ pr.period.upper }}</a></td>
         <td>
-            Bank&nbsp;Start:&nbsp;{{ pr.bank_responsible_start.profile.get_name|default:"N/A" }}<br>
-            Bank&nbsp;End:&nbsp;{{ pr.bank_responsible_end.profile.get_name|default:"N/A" }}<br>
-            Pos&nbsp;Start:&nbsp;{{ pr.pos_responsible_start.profile.get_name|default:"N/A" }}<br>
-            Pos&nbsp;End:&nbsp;{{ pr.pos_responsible_end.profile.get_name|default:"N/A" }}
+            Bank&nbsp;Start:&nbsp;{{ pr.bank_responsible_start.profile.private_name|default:"N/A" }}<br>
+            Bank&nbsp;End:&nbsp;{{ pr.bank_responsible_end.profile.private_name|default:"N/A" }}<br>
+            Pos&nbsp;Start:&nbsp;{{ pr.pos_responsible_start.profile.private_name|default:"N/A" }}<br>
+            Pos&nbsp;End:&nbsp;{{ pr.pos_responsible_end.profile.private_name|default:"N/A" }}
         </td>
         <td data-order="{{ pr.dkk_sales_izettle }}">{{ pr.dkk_sales_izettle }}&nbsp;DKK</td>
         <td data-order="{{ pr.dkk_balance }}" class="text-right">
diff --git a/src/backoffice/templates/includes/refund_list_panel.html b/src/backoffice/templates/includes/refund_list_panel.html
index 7d1d57b26..3e9c89bc5 100644
--- a/src/backoffice/templates/includes/refund_list_panel.html
+++ b/src/backoffice/templates/includes/refund_list_panel.html
@@ -1,4 +1,6 @@
 {% load bornhack %}
+{% load profile_display %}
+
 <table class="table table-hover datatable">
   <thead>
     <tr>
@@ -19,7 +21,7 @@
     {% for refund in refund_list %}
       <tr>
         <td>{{ refund.id }}</td>
-        <td>{{ refund.order.user.username }} &lt;{{ refund.order.user.email }}&gt;</td>
+        <td>{% display_name refund.order.user.profile %} &lt;{{ refund.order.user.email }}&gt;</td>
         <td data-order="{{ refund.amount }}">{{ refund.amount }} DKK</td>
         <td data-order="{{ refund.created|sortable }}">{{ refund.created }}</td>
         <td data-order="{{ refund.updated|sortable }}">{{ refund.updated }}</td>
diff --git a/src/backoffice/templates/permissions_by_permission.html b/src/backoffice/templates/permissions_by_permission.html
index 1d19a9fcd..28cb050f2 100644
--- a/src/backoffice/templates/permissions_by_permission.html
+++ b/src/backoffice/templates/permissions_by_permission.html
@@ -27,13 +27,17 @@
                 <td>{{ perm.name }}</td>
                 <td>
                   <table class="table">
-                    <thead><tr><th>Username</th><th>Name</th><th>Public Credit Name</th></tr></thead>
+                    <thead>
+                      <tr>
+                        <th>Private name</th>
+                        <th>Public credit name</th>
+                      </tr>
+                    </thead>
                     <tbody>
                       {% for user in users %}
                         <tr>
-                          <td>{{ user.username }}</td>
-                          <td>{{ user.profile.name }}</td>
-                          <td>{{ user.profile.public_credit_name }}</td>
+                          <td>{{ user.profile.private_name }}</td>
+                          <td>{{ user.profile.public_name }}</td>
                         </tr>
                       {% endfor %}
                     </table>
diff --git a/src/backoffice/templates/permissions_by_user.html b/src/backoffice/templates/permissions_by_user.html
index 8247dc078..5c78d3cf2 100644
--- a/src/backoffice/templates/permissions_by_user.html
+++ b/src/backoffice/templates/permissions_by_user.html
@@ -14,9 +14,8 @@
       <table class="table table-striped table-hover datatable">
         <thead>
           <tr>
-            <th>Username</th>
-            <th>Name</th>
-            <th>Public Credit Name</th>
+            <th>Private name</th>
+            <th>Public credit name</th>
             <th class="text-center">Staff</th>
             <th class="text-center">Superuser</th>
             <th>User Permissions</th>
@@ -26,9 +25,8 @@
         <tbody>
           {% for user in user_list %}
             <tr>
-              <td>{{ user.username }}</td>
-              <td>{{ user.profile.name }}</td>
-              <td>{{ user.profile.public_credit_name }}</td>
+              <td>{{ user.profile.private_name }}</td>
+              <td>{{ user.profile.public_name }}</td>
               <td class="text-center">{{ user.is_staff|truefalseicon }}</td>
               <td class="text-center">{{ user.is_superuser|truefalseicon }}</td>
               <td>{% if user.is_superuser %}ALL{% else %}{% for perm in user.get_user_permissions %}{% if perm|slice:"0:6" == "camps." %}{{ perm }}<br>{% endif %}{% endfor %}{% endif %}</td>
diff --git a/src/backoffice/templates/posreport_detail.html b/src/backoffice/templates/posreport_detail.html
index 988ba685a..3bb36e7d1 100644
--- a/src/backoffice/templates/posreport_detail.html
+++ b/src/backoffice/templates/posreport_detail.html
@@ -41,19 +41,19 @@ <h3 class="card-title">PosReport {{ posreport.date }} {{ posreport.pos.name }} |
           </tr>
           <tr>
             <th>Bank Responsible Start</th>
-            <td>{{ posreport.bank_responsible_start.profile.get_name|default:"N/A" }}</p>
+            <td>{{ posreport.bank_responsible_start.profile.private_name|default:"N/A" }}</p>
           </tr>
           <tr>
             <th>Bank Responsible End</th>
-            <td>{{ posreport.bank_responsible_end.profile.get_name|default:"N/A" }}</p>
+            <td>{{ posreport.bank_responsible_end.profile.private_name|default:"N/A" }}</p>
           </tr>
           <tr>
             <th>Pos Responsible Start</th>
-            <td>{{ posreport.pos_responsible_start.profile.get_name|default:"N/A" }}</p>
+            <td>{{ posreport.pos_responsible_start.profile.private_name|default:"N/A" }}</p>
           </tr>
           <tr>
             <th>Pos Responsible End</th>
-            <td>{{ posreport.pos_responsible_end.profile.get_name|default:"N/A" }}</p>
+            <td>{{ posreport.pos_responsible_end.profile.private_name|default:"N/A" }}</p>
           </tr>
           <tr>
             <th>All OK?</th>
diff --git a/src/backoffice/templates/shop_ticket_overview.html b/src/backoffice/templates/shop_ticket_overview.html
index 7b4b7cc25..5517eeece 100644
--- a/src/backoffice/templates/shop_ticket_overview.html
+++ b/src/backoffice/templates/shop_ticket_overview.html
@@ -3,6 +3,7 @@
 {% load commonmark %}
 {% load static %}
 {% load imageutils %}
+{% load profile_display %}
 
 {% block title %}
   Shop Tickets | {{ block.super }}
@@ -37,7 +38,7 @@ <h2>Shop Tickets</h2>
           <td>{{ ticket.product.name }}</td>
           <td class="text-center">{{ ticket.opr.quantity }}</td>
           <td>{{ ticket.order.customer_comment|default:"None" }}</td>
-          <td>{{ ticket.order.user.profile.name }}
+          <td>{% display_name ticket.order.user.profile %}
             / {{ ticket.order.user.email }}</td>
           <td data-order="{{ ticket.used_at|sortable }}">{{ ticket.used_at|default:"N/A" }}</td>
           <td>{{ ticket.order.payment_method }}</td>
diff --git a/src/backoffice/templates/team_permissions_manage.html b/src/backoffice/templates/team_permissions_manage.html
index 6cfb094b8..6890084cb 100644
--- a/src/backoffice/templates/team_permissions_manage.html
+++ b/src/backoffice/templates/team_permissions_manage.html
@@ -13,8 +13,7 @@ <h3 class="card-header">Manage {{ team.name }} Team Permissions</h3>
         <table class="table table-striped datatable">
           <thead>
             <tr>
-              <th>Username</th>
-              <th>Name</th>
+              <th>Private Name</th>
               <th>Public Credit Name</th>
               <th class="text-center">Superuser</th>
               {% for perm in perms %}
@@ -25,9 +24,8 @@ <h3 class="card-header">Manage {{ team.name }} Team Permissions</h3>
           <tbody>
             {% for member in team.approved_members.all %}
               <tr>
-                <td>{{ member.username }}</td>
-                <td>{{ member.profile.name }}</td>
-                <td>{{ member.profile.public_credit_name }}</td>
+                <td>{{ member.profile.private_name }}</td>
+                <td>{{ member.profile.public_name }}</td>
                 <td class="text-center">{{ member.is_superuser|truefalseicon }}</td>
                 {% for perm in perms %}
                   {% for field in form.visible_fields %}
diff --git a/src/backoffice/templates/token_detail.html b/src/backoffice/templates/token_detail.html
index 8a4dcc4a5..38ac39bc0 100644
--- a/src/backoffice/templates/token_detail.html
+++ b/src/backoffice/templates/token_detail.html
@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load profile_display %}
 
 {% block title %}
   Token Details | Pos | BackOffice | {{ block.super }}
@@ -51,16 +52,14 @@ <h3>Token Finds</h3>
       <table class="table table-striped{% if not nodatatable %} datatable{% endif %}">
         <thead>
           <tr>
-              <th>Public credit name</th>
-              <th>Username</th>
+            <th>User</th>
             <th>Timestamp</th>
           </tr>
         </thead>
         <tbody>
           {% for tf in token.tokenfind_set.all %}
             <tr>
-              <td>{{ tf.user.profile.public_credit_name }}</td>
-              <td>{{ tf.user.username }}</td>
+              <td>{% display_name tf.user.profile %}</td>
               <td>{{ tf.created }}</td>
             </tr>
           {% endfor %}
diff --git a/src/backoffice/templates/token_stats.html b/src/backoffice/templates/token_stats.html
index 5fe8230b4..27d41bc4c 100644
--- a/src/backoffice/templates/token_stats.html
+++ b/src/backoffice/templates/token_stats.html
@@ -1,5 +1,6 @@
 {% extends 'base.html' %}
 {% load bornhack %}
+{% load profile_display %}
 
 {% block title %}
   Token Stats | Backoffice | {{ block.super }}
@@ -15,8 +16,7 @@
         <table class="table table-striped{% if not nodatatable %} datatable{% endif %}">
           <thead>
             <tr>
-              <th>Public credit name</th>
-              <th>Username</th>
+              <th>User</th>
               <th>Finds</th>
               <th>Last token found</th>
             </tr>
@@ -24,8 +24,7 @@
           <tbody>
             {% for user in user_list %}
               <tr>
-                <td>{{ user.profile.public_credit_name }}</td>
-                <td>{{ user.username }}</td>
+                <td>{% display_name user.profile %}</td>
                 <td>{{ user.token_find_count }}</td>
                 <td>{{ user.last_token_find }}</td>
               </tr>
diff --git a/src/economy/templates/includes/expense_detail_panel.html b/src/economy/templates/includes/expense_detail_panel.html
index 491c2c460..1ea7dfff2 100644
--- a/src/economy/templates/includes/expense_detail_panel.html
+++ b/src/economy/templates/includes/expense_detail_panel.html
@@ -1,3 +1,5 @@
+{% load profile_display %}
+
 <div class="card">
   <div class="card-header">Expense Details for {{ expense.pk }}</div>
   <div class="card-body">
@@ -5,7 +7,7 @@
       {% if request.resolver_match.app_name == "backoffice" %}
         <tr>
           <th>Created By</th>
-          <td>{{ expense.user.profile.get_name }}</td>
+          <td>{% display_name expense.user.profile %}</td>
         </tr>
       {% endif %}
       <tr>
diff --git a/src/economy/templates/includes/expense_list_panel.html b/src/economy/templates/includes/expense_list_panel.html
index a949b4350..4343d6336 100644
--- a/src/economy/templates/includes/expense_list_panel.html
+++ b/src/economy/templates/includes/expense_list_panel.html
@@ -1,4 +1,6 @@
 {% load bornhack %}
+{% load profile_display %}
+
 {% if expense_list %}
   <table class="table table-hover datatable">
     <thead>
@@ -31,7 +33,7 @@
           {% endif %}
 
           <td data-order="{{ expense.invoice_date|sortable }}">{{ expense.invoice_date }}</td>
-          <td>{{ expense.user.profile.get_name }}</td>
+          <td>{% display_name expense.user.profile %}</td>
           <td>{{ expense.get_payment_status_display }}</td>
           <td>{{ expense.creditor.name }}</td>
           <td data-order="{{ expense.amount }}">{{ expense.amount }} DKK</td>
diff --git a/src/economy/templates/includes/reimbursement_detail_panel.html b/src/economy/templates/includes/reimbursement_detail_panel.html
index 7b871e96a..98732baca 100644
--- a/src/economy/templates/includes/reimbursement_detail_panel.html
+++ b/src/economy/templates/includes/reimbursement_detail_panel.html
@@ -1,4 +1,5 @@
 {% load bornhack %}
+{% load profile_display %}
 <div class="card">
   <div class="card-header">Reimbursement {{ reimbursement.pk }} Details</div>
   <div class="card-body">
@@ -9,7 +10,7 @@
       </tr>
       <tr>
         <th>Reimbursement User</th>
-        <td>{{ reimbursement.reimbursement_user.profile.get_name }}</td>
+        <td>{% display_name reimbursement.reimbursement_user.profile %}</td>
       </tr>
       <tr>
         <th>Total Amount</th>
diff --git a/src/economy/templates/includes/reimbursement_list_panel.html b/src/economy/templates/includes/reimbursement_list_panel.html
index 4b88c228e..1d56925c3 100644
--- a/src/economy/templates/includes/reimbursement_list_panel.html
+++ b/src/economy/templates/includes/reimbursement_list_panel.html
@@ -1,4 +1,6 @@
 {% load bornhack %}
+{% load profile_display %}
+
 {% if reimbursement_list %}
   <table class="table table-hover datatable">
     <thead>
@@ -25,8 +27,8 @@
           {% else %}
             <td>{{ reim.camp }}</td>
           {% endif %}
-          <td>{{ reim.user.profile.get_name }}</td>
-          <td>{{ reim.reimbursement_user.profile.get_name }}</td>
+          <td>{% display_name reim.user.profile %}</td>
+          <td>{% display_name reim.reimbursement_user.profile %}</td>
           <td>{{ reim.bank_account|default:"N/A" }}</td>
           <td>{{ reim.notes|default:"N/A" }}</td>
           <td data-order="{{ reim.amount }}">{{ reim.amount }} DKK</td>
diff --git a/src/economy/templates/includes/revenue_detail_panel.html b/src/economy/templates/includes/revenue_detail_panel.html
index aa3cbab20..fe6c080cf 100644
--- a/src/economy/templates/includes/revenue_detail_panel.html
+++ b/src/economy/templates/includes/revenue_detail_panel.html
@@ -1,3 +1,5 @@
+{% load profile_display %}
+
 <div class="card">
   <div class="card-header">Revenue Details for {{ revenue.pk }}</div>
   <div class="card-body">
@@ -5,7 +7,7 @@
       {% if request.resolver_match.app_name == "backoffice" %}
         <tr>
           <th>Created By</th>
-          <td>{{ revenue.user.profile.get_name }}</td>
+          <td>{% display_name revenue.user.profile %}</td>
         </tr>
       {% endif %}
       <tr>
diff --git a/src/economy/templates/includes/revenue_list_panel.html b/src/economy/templates/includes/revenue_list_panel.html
index 0600aed23..2bde8b19a 100644
--- a/src/economy/templates/includes/revenue_list_panel.html
+++ b/src/economy/templates/includes/revenue_list_panel.html
@@ -1,4 +1,6 @@
 {% load bornhack %}
+{% load profile_display %}
+
 {% if revenue_list %}
   <table class="table table-hover datatable">
     <thead>
@@ -31,7 +33,7 @@
           {% endif %}
 
           <td data-order="{{ revenue.invoice_date|sortable }}">{{ revenue.invoice_date }}</td>
-          <td>{{ revenue.user.profile.get_name }}</td>
+          <td>{% display_name revenue.user.profile %}</td>
           <td>{{ revenue.get_payment_status_display }}</td>
           <td>{{ revenue.debtor }}</td>
           <td data-order="{{ revenue.amount }}">{{ revenue.amount }} DKK</td>
diff --git a/src/maps/views.py b/src/maps/views.py
index 0960e7817..0c1ca078f 100644
--- a/src/maps/views.py
+++ b/src/maps/views.py
@@ -403,7 +403,7 @@ def dump_locations(self) -> list[object]:
                     "type": location.type.name,
                     "icon": location.type.icon,
                     "marker": location.type.marker,
-                    "user": location.user.profile.get_public_credit_name,
+                    "user": location.user.profile.public_name,
                     "data": location.data,
                 },
             }
diff --git a/src/people/templates/people.html b/src/people/templates/people.html
index a6d083ec3..c51758a40 100644
--- a/src/people/templates/people.html
+++ b/src/people/templates/people.html
@@ -2,6 +2,7 @@
 {% load commonmark %}
 {% load teams_tags %}
 {% load static %}
+{% load profile_display %}
 
 {% block title %}
   People | {{ block.super }}
@@ -35,14 +36,12 @@ <h4 class="card-title">
                     </td>
                     <td>
                       {% for resp in team.leads.all %}
-                        {{ resp.profile.get_public_credit_name }}<br>
+                        {% display_name resp.profile %}<br>
                       {% endfor %}
                     </td>
                     <td>
                       {% for member in team.regular_members.all %}
-                        {% if member.profile.get_public_credit_name != "Unnamed" %}
-                          {{ member.profile.get_public_credit_name }}<br>
-                        {% endif %}
+                        {% display_name member.profile %}<br>
                       {% empty %}
                         No team members
                       {% endfor %}
diff --git a/src/profiles/migrations/0020_alter_profile_name_alter_profile_public_credit_name.py b/src/profiles/migrations/0020_alter_profile_name_alter_profile_public_credit_name.py
new file mode 100644
index 000000000..01214748b
--- /dev/null
+++ b/src/profiles/migrations/0020_alter_profile_name_alter_profile_public_credit_name.py
@@ -0,0 +1,32 @@
+# Generated by Django 5.2.9 on 2026-02-06 19:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("profiles", "0019_remove_profile_location"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="profile",
+            name="name",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="What can we call you? (visible to any team member aka. volunteer, but not the public)",
+                max_length=200,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="profile",
+            name="public_credit_name",
+            field=models.CharField(
+                blank=True,
+                help_text="The name you want to appear in the credits section of the public website (on Team and People pages). Leave this empty if you want your name hidden on the public webpages.",
+                max_length=100,
+            ),
+        ),
+    ]
diff --git a/src/profiles/models.py b/src/profiles/models.py
index 9ab0c5bb3..a2debc3fc 100644
--- a/src/profiles/models.py
+++ b/src/profiles/models.py
@@ -7,6 +7,8 @@
 from django.utils.translation import gettext_lazy as _
 from django_prometheus.models import ExportModelOperationsMixin
 
+from camps.models import Camp
+from teams.models import TeamMember
 from utils.models import CreatedUpdatedModel
 from utils.models import UUIDModel
 
@@ -34,7 +36,7 @@ class Meta:
         max_length=200,
         default="",
         blank=True,
-        help_text="Your name or handle (only visible to team leads and orga)",
+        help_text="What can we call you? (visible to any team member aka. volunteer, but not the public)",
     )
 
     description = models.TextField(
@@ -46,7 +48,7 @@ class Meta:
     public_credit_name = models.CharField(
         blank=True,
         max_length=100,
-        help_text="The name you want to appear on in the credits section of the public website (on Team and People pages). Leave this empty if you want your name hidden on the public webpages.",
+        help_text="The name you want to appear in the credits section of the public website (on Team and People pages). Leave this empty if you want your name hidden on the public webpages.",
     )
 
     public_credit_name_approved = models.BooleanField(
@@ -75,10 +77,6 @@ class Meta:
         help_text="When using your BornHack account to login to other sites with OIDC this value is served as the OIDC standard claim 'preferred_username'. You can set this to the username you would prefer to use on remote sites where you login with your BornHack account.",
     )
 
-    @property
-    def email(self):
-        return self.user.email
-
     def __str__(self) -> str:
         return self.user.username
 
@@ -90,17 +88,50 @@ def approve_public_credit_name(self) -> None:
         self.save()
 
     @property
-    def get_public_credit_name(self):
-        """Convenience method to return profile.public_credit_name if it is approved,
-        and the string "Unnamed" otherwise.
+    def email(self):
+        return self.user.email
+
+    def get_display_name(self, user: User, camp: Camp) -> str:
         """
-        if self.public_credit_name_approved:
-            return self.public_credit_name
-        return "Unnamed"
+        Return the profile's public or private name depending on
+        requesting user's team membership.
+
+        `private_name` is returned for all volunteers, defined as someone who is
+        a team member in the relevant camp.
+
+        `public_name` is unrestricted and returned in all other cases.
+        """
+        if not user.is_authenticated:
+            return self.public_name
+
+        if TeamMember.objects.filter(user=user, team__camp=camp).exists():
+            return self.private_name
+
+        return self.public_name
+
+    @property
+    def public_name(self) -> str:
+        """Return `public_credit_name` if it is approved or else `Unnamed`.
+
+        Unrestricted usage.
+        """
+        return (
+            self.public_credit_name
+            if self.public_credit_name_approved
+            else "Unnamed"
+        )
 
     @property
-    def get_name(self):
-        """Convenience method to return profile.name if set, otherwise username."""
+    def private_name(self) -> str:
+        """Return `name` if set or else `public_credit_name` if approved,
+        with fallback to username.
+
+        Restricted usage: Should only be visible to team members for related camp.
+        """
         if self.name:
             return self.name
-        return self.user.username
+        elif self.public_credit_name_approved:
+            return self.public_credit_name
+        else:
+            return self.user.username
+
diff --git a/src/profiles/templates/profile_detail.html b/src/profiles/templates/profile_detail.html
index 0de92e80f..1c27d0df9 100644
--- a/src/profiles/templates/profile_detail.html
+++ b/src/profiles/templates/profile_detail.html
@@ -28,7 +28,7 @@ <h4>Your information</h4>
         <tr>
           <td width="30%">
             <b>Name</b><br />
-            <small>Not visible to the public.</small></td>
+            <small>Not visible to the public but visible to volunteers. (defined as a person being a team member at any camp)</small></td>
           <td width="70%">
             {{ profile.name|default:"N/A" }}
           </td>
diff --git a/src/profiles/templatetags/__init__.py b/src/profiles/templatetags/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/profiles/templatetags/profile_display.py b/src/profiles/templatetags/profile_display.py
new file mode 100644
index 000000000..3eefadc94
--- /dev/null
+++ b/src/profiles/templatetags/profile_display.py
@@ -0,0 +1,19 @@
+from django import template
+
+from profiles.models import Profile
+
+register = template.Library()
+
+@register.simple_tag(takes_context=True)
+def display_name(context, profile: Profile):
+    """
+    Return the profile display name depending on the users permissions.
+    """
+    try:
+        user = context["request"].user
+        camp = context["camp"]
+    except KeyError:
+        return profile.public_name
+
+    return profile.get_display_name(user, camp)
+
diff --git a/src/profiles/tests.py b/src/profiles/tests.py
new file mode 100644
index 000000000..53a27025b
--- /dev/null
+++ b/src/profiles/tests.py
@@ -0,0 +1,212 @@
+from collections import namedtuple
+from django.contrib.auth.models import AnonymousUser
+from django.template import Context
+from django.template import Template
+
+from teams.models import TeamMember
+from utils.tests import BornhackTestBase
+
+
+class TestTemplateTags(BornhackTestBase):
+    """Class for grouping `templatetags` tests."""
+
+    @classmethod
+    def setUpTestData(cls) -> None:
+        """Test setup."""
+        super().setUpTestData()
+        cls.profile = cls.users[9].profile
+        cls.profile.public_credit_name_approved = False
+
+        cls.public_fallback = "Unnamed"
+        cls.user = cls.users[8]
+        cls.FakeRequest = namedtuple("FakeRequest", ["user"])
+        cls.fake_request = cls.FakeRequest(user=cls.user)
+
+    def test_display_name_for_anon_user(self) -> None:
+        """Test `display_name` for an anonymous user."""
+        context = {"user": self.profile}
+        # Profile without approved `public_credit_name`
+        result = Template(
+            "{% load profile_display %}"
+            "{% display_name user %}"
+        ).render(Context(context))
+
+        assert result == self.public_fallback
+
+        # Profile with approved `public_credit_name`
+        self.profile.public_credit_name_approved = True
+        result = Template(
+            "{% load profile_display %}"
+            "{% display_name user %}"
+        ).render(Context(context))
+
+        assert result == self.profile.public_credit_name
+
+    def test_display_name_for_volunteer(self) -> None:
+        """Test `display_name` for a volunteer (team member)."""
+        context = {
+            "user": self.profile,
+            "request": self.fake_request,
+            "camp": self.camp,
+        }
+        # Profile with `name`
+        result = Template(
+            "{% load profile_display %}"
+            "{% display_name user %}"
+        ).render(Context(context))
+
+        assert result == self.profile.name
+
+        # Profile with approved `public_credit_name`
+        self.profile.name = None
+        self.profile.public_credit_name_approved = True
+        result = Template(
+            "{% load profile_display %}"
+            "{% display_name user %}"
+        ).render(Context(context))
+
+        assert result == self.profile.public_credit_name
+
+        # Profile without name and approved `public_credit_name`
+        self.profile.name = None
+        self.profile.public_credit_name_approved = False
+        result = Template(
+            "{% load profile_display %}"
+            "{% display_name user %}"
+        ).render(Context(context))
+
+        assert result == self.profile.user.username
+
+    def test_display_name_handling_team_member_by_camp(self) -> None:
+        """Test `display_name` handles a user being volunteer at another camp."""
+        context = {
+            "user": self.profile,
+            "request": self.fake_request,
+            "camp": self.camp,
+        }
+        # Team member of related camp
+        result = Template(
+            "{% load profile_display %}"
+            "{% display_name user %}"
+        ).render(Context(context))
+
+        assert result == self.profile.private_name
+
+        # Team member of previous camp
+        TeamMember.objects.filter(user=self.user, team__camp=self.camp).delete()
+        result = Template(
+            "{% load profile_display %}"
+            "{% display_name user %}"
+        ).render(Context(context))
+
+        assert result == self.profile.public_name
+
+        # Not a Team member of any camps
+        fake_request = self.FakeRequest(user=self.users[13])
+        context.update({"request": fake_request})
+        result = Template(
+            "{% load profile_display %}"
+            "{% display_name user %}"
+        ).render(Context(context))
+
+        assert result == self.profile.public_name
+
+
+class TestProfileModel(BornhackTestBase):
+    """Class for grouping `ProfileModel` tests."""
+
+    @classmethod
+    def setUpTestData(cls) -> None:
+        """Test setup."""
+        super().setUpTestData()
+        cls.profile = cls.users[10].profile
+        cls.profile.public_credit_name_approved = False
+
+    def test_approving_public_credit_name(self) -> None:
+        """Test `approve_public_credit_name` changes object state."""
+        assert self.profile.public_credit_name_approved is False
+
+        self.profile.approve_public_credit_name()
+
+        assert self.profile.public_credit_name_approved is True
+
+    def test_return_approved_public_credit_name(self) -> None:
+        """
+        Test `public_name` property returns the approved `public_credit_name`.
+        """
+        self.profile.public_credit_name_approved = True
+
+        assert self.profile.public_name == self.profile.public_credit_name
+
+    def test_public_name_not_approved_return_unnamed(self) -> None:
+        """
+        Test `public_name` property returns `Unnamed`
+        when `public_credit_name` isn't approved.
+        """
+        assert self.profile.public_name == "Unnamed"
+
+    def test_private_name_returns_display_name(self) -> None:
+        """Test `private_name` property returns `name` when set."""
+        expected = "Test"
+        self.profile.name = expected
+
+        assert self.profile.private_name == expected
+
+        self.profile.public_credit_name_approved = True
+
+        assert self.profile.private_name == expected
+
+    def test_private_name_return_public_credit_name(self) -> None:
+        """
+        Test `private_name` property returns the approved public_credit_name,
+        when no `name` is set.
+        """
+        self.profile.name = None
+        self.profile.public_credit_name_approved = True
+
+        assert self.profile.private_name == self.profile.public_credit_name
+
+    def test_private_name_return_username_as_fallback(self) -> None:
+        """
+        Test `private_name` property return the username as a fallback,
+        when no profile name or public_credit_name is added.
+        """
+        self.profile.name = None
+        self.profile.public_credit_name = None
+
+        assert self.profile.private_name == self.profile.user.username
+
+    def test_get_display_name_handling_team_member_by_related_camp(self) -> None:
+        """Test `get_display_name` handles a user being volunteer at related camp."""
+        user = self.users[8]
+
+        result = self.profile.get_display_name(user, self.camp)
+
+        assert result == self.profile.private_name
+
+    def test_get_display_name_handling_team_member_by_previous_camp(self) -> None:
+        """Test `get_display_name` handles a user being volunteer at previous camp."""
+        user = self.users[8]
+        TeamMember.objects.filter(user=user, team__camp=self.camp).delete()
+
+        result = self.profile.get_display_name(user, self.camp)
+
+        assert result == self.profile.public_name
+
+    def test_get_display_name_handling_not_a_team_member_in_any_camp(self) -> None:
+        """Test `get_display_name` handles a user not being a team member in any camps."""
+        user = self.users[13]
+
+        result = self.profile.get_display_name(user, self.camp)
+
+        assert result == self.profile.public_name
+
+    def test_get_display_name_with_unauthenticated_user(self) -> None:
+        """
+        Test `get_display_name` return public name when user is unauthenticated.
+        """
+        user = AnonymousUser()
+
+        result = self.profile.get_display_name(user, self.camp)
+
+        assert result == self.profile.public_name
diff --git a/src/profiles/views.py b/src/profiles/views.py
index dd5a11783..c61951bb8 100644
--- a/src/profiles/views.py
+++ b/src/profiles/views.py
@@ -92,7 +92,7 @@ def get_context_data(self, **kwargs) -> dict:
             "user_id": self.request.user.id,
         }
         context["profile"] = {
-            "public_credit_name": self.request.user.profile.get_public_credit_name,
+            "public_credit_name": self.request.user.profile.public_name,
             "description": self.request.user.profile.description,
         }
         context["teams"] = [{"team": team.name, "camp": team.camp.title} for team in self.request.user.teams.all()]
diff --git a/src/program/mixins.py b/src/program/mixins.py
index b48b4d72f..a121dbc7a 100644
--- a/src/program/mixins.py
+++ b/src/program/mixins.py
@@ -59,14 +59,13 @@ def dispatch(self, request, *args, **kwargs):
 class EnsureUserOwnsProposalMixin(SingleObjectMixin):
     def dispatch(self, request, *args, **kwargs):
         # make sure that this proposal belongs to the logged in user
-        if self.get_object().user.username != request.user.username:
-            messages.error(request, "No thanks")
-            return redirect(
-                reverse("program:proposal_list", kwargs={"camp_slug": self.camp.slug}),
-            )
+        if self.get_object().user is request.user:
+            return super().dispatch(request, *args, **kwargs)
 
-        # alright, continue with the request
-        return super().dispatch(request, *args, **kwargs)
+        messages.error(request, "No thanks")
+        return redirect(
+            reverse("program:proposal_list", kwargs={"camp_slug": self.camp.slug}),
+        )
 
 
 class UrlViewMixin:
diff --git a/src/program/templates/includes/event_feedback_detail_panel.html b/src/program/templates/includes/event_feedback_detail_panel.html
index c5cda4f7c..7cc78dad7 100644
--- a/src/program/templates/includes/event_feedback_detail_panel.html
+++ b/src/program/templates/includes/event_feedback_detail_panel.html
@@ -1,5 +1,7 @@
 {% load django_bootstrap5 %}
 {% load commonmark %}
+{% load profile_display %}
+
 <div class="card">
   <div class="card-header">
     <span class="h3">Feedback for Event: {{ event.title }}</span>
@@ -8,8 +10,8 @@
     <table class="table table-bordered">
       {% if request.resolver_match.url_name == "approve_event_feedback" %}
         <tr>
-          <th>Username (feedback submitter)</th>
-          <td>{{ event_feedback.user.username }}</td>
+          <th>User</th>
+          <td>{% display_name event_feedback.user.profile %}</td>
         </tr>
       {% endif %}
       <tr>
diff --git a/src/rideshare/views.py b/src/rideshare/views.py
index 463f756a9..2e577f33c 100644
--- a/src/rideshare/views.py
+++ b/src/rideshare/views.py
@@ -79,7 +79,7 @@ class RideCreate(LoginRequiredMixin, CampViewMixin, CreateView):
 
     def get_initial(self):
         """Default 'author' to users public_credit_name where relevant."""
-        return {"author": self.request.user.profile.get_public_credit_name}
+        return {"author": self.request.user.profile.public_name}
 
     def form_valid(self, form, **kwargs):
         """Set camp and user before saving."""
diff --git a/src/teams/admin.py b/src/teams/admin.py
index 9b661855d..362b13962 100644
--- a/src/teams/admin.py
+++ b/src/teams/admin.py
@@ -43,7 +43,7 @@ class TeamAdmin(admin.ModelAdmin):
     def get_leads(self, obj: Team) -> str:
         """Method to return team leads."""
         return ", ".join(
-            [lead.profile.public_credit_name for lead in obj.leads.all()],
+            [lead.profile.private_name for lead in obj.leads.all()],
         )
 
     list_display: ClassVar[list[str]] = [
diff --git a/src/teams/templates/task_detail.html b/src/teams/templates/task_detail.html
index bd716c14b..bdc5ce3c4 100644
--- a/src/teams/templates/task_detail.html
+++ b/src/teams/templates/task_detail.html
@@ -1,6 +1,7 @@
 {% extends 'team_base.html' %}
 {% load commonmark %}
 {% load django_bootstrap5 %}
+{% load profile_display %}
 
 {% block title %}
   {{ task.name }}
@@ -25,7 +26,7 @@ <h4>Comments</h4>
             <ul class="list-group">
               {% for comment in task.comments.all %}
                 <li class="list-group-item">
-                  <strong>{{ comment.author.user.profile.get_public_credit_name }}</strong>: {{ comment.comment }}
+                  <strong>{% display_name comment.author.user.profile %}</strong>: {{ comment.comment }}
                 </li>
               {% empty %}
                 <li class="list-group-item">
diff --git a/src/teams/templates/team_list.html b/src/teams/templates/team_list.html
index d16e8f8d8..e1397bf80 100644
--- a/src/teams/templates/team_list.html
+++ b/src/teams/templates/team_list.html
@@ -1,6 +1,7 @@
 {% extends 'base.html' %}
 {% load commonmark %}
 {% load teams_tags %}
+{% load profile_display %}
 
 {% block title %}
   Teams | {{ block.super }}
@@ -77,7 +78,7 @@ <h4>Your teams</h4>
 
             <td>
               {% for resp in team.leads.all %}
-                {{ resp.profile.get_public_credit_name }}{% if not forloop.last %},{% endif %}<br>
+                {% display_name resp.profile %}{% if not forloop.last %},{% endif %}<br>
               {% endfor %}
             </td>
 
diff --git a/src/teams/templates/team_members.html b/src/teams/templates/team_members.html
index c18e00338..26fae34b7 100644
--- a/src/teams/templates/team_members.html
+++ b/src/teams/templates/team_members.html
@@ -2,6 +2,7 @@
 {% load commonmark %}
 {% load django_bootstrap5 %}
 {% load teams_tags %}
+{% load profile_display %}
 
 {% block title %}
   Members | {{ block.super }}
@@ -19,15 +20,12 @@ <h4>Members</h4>
         <thead>
           <tr>
             <th>
-              Public name
+              User
             </th>
             <th>
               Status
             </th>
             {% if team.lead_permission_set in perms %}
-              <th>
-                Name
-              </th>
               <th>
                 Email
               </th>
@@ -45,16 +43,16 @@ <h4>Members</h4>
             {% if member.approved or not member.approved and team.lead_permission_set in perms %}
               <tr>
                 <td>
-                  {{ member.user.profile.get_public_credit_name }} {% if member.user == request.user %}(this is you!){% endif %}
+                  {% display_name member.user.profile %}
+                  {% if member.user == request.user %}
+                  <span class="badge text-bg-info">This is you</span>
+                  {% endif %}
                 </td>
                 <td>
                   Team {% if member.lead %}Lead{% else %}Member{% endif %}
                   {% if not member.approved %}(pending approval){% endif %}
                 </td>
                 {% if team.lead_permission_set in perms %}
-                  <td>
-                    {{ member.user.profile.name }}
-                  </td>
                   <td>
                     {{ member.user.email }}
                   </td>
diff --git a/src/teams/templates/team_shift_list.html b/src/teams/templates/team_shift_list.html
index a2a2cb789..bafe51ff8 100644
--- a/src/teams/templates/team_shift_list.html
+++ b/src/teams/templates/team_shift_list.html
@@ -1,6 +1,7 @@
 {% extends 'team_base.html' %}
 {% load commonmark %}
 {% load django_bootstrap5 %}
+{% load profile_display %}
 
 {% block title %}
   Shifts | {{ block.super }}
@@ -59,7 +60,7 @@ <h4>
           </td>
           <td>
             {% for member in shift.team_members.all %}
-              {{ member.user.profile.get_public_credit_name }}{% if not forloop.last %},{% endif %}
+              {% display_name member.user.profile %}{% if not forloop.last %},{% endif %}
             {% empty %}
               None!
             {% endfor %}
diff --git a/src/teams/templates/teammember_approve.html b/src/teams/templates/teammember_approve.html
index 71fb35a2d..0d720e61e 100644
--- a/src/teams/templates/teammember_approve.html
+++ b/src/teams/templates/teammember_approve.html
@@ -1,18 +1,19 @@
 {% extends 'team_base.html' %}
 {% load commonmark %}
+{% load profile_display %}
 
 {% block title %}
-  Approve team member {{ teammember.user.profile.name }} for the {{ teammember.team.name }} team
+  Approve team member {% display_name teammember.user.profile %} for the {{ teammember.team.name }} team
 {% endblock %}
 
 {% block team_content %}
 
-  <h3>Approve member {{ teammember.user.profile.name }} for the {{ teammember.team.name }} team</h3>
-  <p class="lead">Really approve the user <b>{{ teammember.user.profile.name }}</b> for the {{ teammember.team.name }} team? The user will receive an email with a message.<p>
+  <h3>Approve member {% display_name teammember.user.profile %} for the {{ teammember.team.name }} team</h3>
+  <p class="lead">The user will receive an email with a message.</p>
     <form method="POST">
       {% csrf_token %}
       {{ form }}
-      <button class="btn btn-success" type="submit"><i class="fas fa-check"></i> Add teammember</button>
+      <button class="btn btn-success" type="submit"><i class="fas fa-check"></i> Add team member</button>
       <a href="{% url 'teams:general' camp_slug=teammember.team.camp.slug team_slug=teammember.team.slug %}" class="btn btn-secondary" type="submit"><i class="fas fa-times"></i> Cancel</a>
     </form>
 
diff --git a/src/teams/templates/teammember_make_lead.html b/src/teams/templates/teammember_make_lead.html
index c34b1a1b6..2c117f3d7 100644
--- a/src/teams/templates/teammember_make_lead.html
+++ b/src/teams/templates/teammember_make_lead.html
@@ -1,14 +1,15 @@
 {% extends 'team_base.html' %}
 {% load commonmark %}
+{% load profile_display %}
 
 {% block title %}
-  Make team member {{ teammember.user.profile.get_name }} team lead for the {{ teammember.team.name }} team
+  Make team member {% display_name teammember.user.profile %} team lead for the {{ teammember.team.name }} team
 {% endblock %}
 
 {% block team_content %}
 
   <h3>Make team lead</h3>
-  <p class="lead">Really make the user <b>{{ teammember.user.profile.get_name }}</b> team lead for the {{ teammember.team.name }} team?<p>
+  <p class="lead">Really make the user <b>{% display_name teammember.user.profile %}</b> team lead for the {{ teammember.team.name }} team?<p>
     <form method="POST">
       {% csrf_token %}
       {{ form }}
diff --git a/src/teams/templates/teammember_remove.html b/src/teams/templates/teammember_remove.html
index 15bcc58f3..3d8bd18a1 100644
--- a/src/teams/templates/teammember_remove.html
+++ b/src/teams/templates/teammember_remove.html
@@ -1,18 +1,19 @@
 {% extends 'team_base.html' %}
 {% load commonmark %}
+{% load profile_display %}
 
 {% block title %}
-  Remove member {{ teammember.user.profile.name }} from the {{ teammember.team.name }} team
+  Remove member {% display_name teammember.user.profile %} from the {{ teammember.team.name }} team
 {% endblock %}
 
 {% block team_content %}
 
-  <h3>Remove member {{ teammember.user.profile.name }} from the {{ teammember.team.name }} team</h3>
-  <p class="lead">Really remove the user <b>{{ teammember.user.profile.name }}</b> from the {{ teammember.team.name }} team? The user will receive an email with a message.<p>
+  <h3>Remove member {% display_name teammember.user.profile %} from the {{ teammember.team.name }} team</h3>
+  <p class="lead">The user will receive an email with a message.</p>
     <form method="POST">
       {% csrf_token %}
       {{ form }}
-      <button class="btn btn-danger" type="submit"><i class="fas fa-trash-o"></i> Remove teammember</button>
+      <button class="btn btn-danger" type="submit"><i class="fas fa-trash-o"></i> Remove team member</button>
       <a href="{% url 'teams:general' camp_slug=teammember.team.camp.slug team_slug=teammember.team.slug %}" class="btn btn-secondary" type="submit"><i class="fas fa-times"></i> Cancel</a>
     </form>
 {% endblock %}
diff --git a/src/teams/templates/teammember_take_lead.html b/src/teams/templates/teammember_take_lead.html
index ace2e95f5..a39414427 100644
--- a/src/teams/templates/teammember_take_lead.html
+++ b/src/teams/templates/teammember_take_lead.html
@@ -1,13 +1,14 @@
 {% extends 'team_base.html' %}
 {% load commonmark %}
+{% load profile_display %}
 
 {% block title %}
-  Make team lead {{ teammember.user.profile.get_name }} a normal member of the {{ teammember.team.name }} team
+  Make team lead {% display_name teammember.user.profile %} a normal member of the {{ teammember.team.name }} team
 {% endblock %}
 
 {% block team_content %}
   <h3>Remove team lead</h3>
-  <p class="lead">Really make the team lead <b>{{ teammember.user.profile.get_name }}</b> a normal member of the {{ teammember.team.name }} team?<p>
+  <p class="lead">Really make the team lead <b>{% display_name teammember.user.profile %}</b> a normal member of the {{ teammember.team.name }} team?<p>
     <form method="POST">
       {% csrf_token %}
       {{ form }}
diff --git a/src/tokens/views.py b/src/tokens/views.py
index 9888a92be..363163968 100644
--- a/src/tokens/views.py
+++ b/src/tokens/views.py
@@ -282,7 +282,7 @@ def form_valid(self, form):
 
         if created:
             # user found a new token
-            username = self.request.user.profile.get_public_credit_name
+            username = self.request.user.profile.public_name
             if username == "Unnamed":
                 username = "anonymous_player_{request.user.id}"