diff --git a/netbox/templates/users/account/token.html b/netbox/templates/users/account/token.html
index 56ca4307b..6df1d1367 100644
--- a/netbox/templates/users/account/token.html
+++ b/netbox/templates/users/account/token.html
@@ -24,24 +24,26 @@
         <h5 class="card-header">{% trans "Token" %}</h5>
         <div class="card-body">
           <table class="table table-hover attr-table">
-            {% if key %}
-              <tr>
-                <th scope="row">{% trans "Key" %}</th>
-                <td>
+            <tr>
+              <th scope="row">{% trans "Key" %}</th>
+              <td>
+                {% if key %}
                   <div class="float-end">
                     {% copy_content "token_id" %}
                   </div>
                   <div id="token_id">{{ key }}</div>
-                </td>
-              </tr>
-            {% endif %}
+                {% else %}
+                  {{ object.partial }}
+                {% endif %}
+              </td>
+            </tr>
             <tr>
               <th scope="row">{% trans "Description" %}</th>
               <td>{{ object.description|placeholder }}</td>
             </tr>
             <tr>
-              <th scope="row">{% trans "User" %}</th>
-              <td>{{ object.user }}</td>
+              <th scope="row">{% trans "Write enabled" %}</th>
+              <td>{% checkmark object.write_enabled %}</td>
             </tr>
             <tr>
               <th scope="row">{% trans "Created" %}</th>
@@ -49,13 +51,15 @@
             </tr>
             <tr>
               <th scope="row">{% trans "Expires" %}</th>
-              <td>
-                {% if object.expires %}
-                  {{ object.expires|annotated_date }}
-                {% else %}
-                  <span>{% trans "Never" %}</span>
-                {% endif %}
-              </td>
+              <td>{{ object.expires|placeholder }}</td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "Last used" %}</th>
+              <td>{{ object.last_used|placeholder }}</td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "Allowed IPs" %}</th>
+              <td>{{ object.allowed_ips|join:", "|placeholder }}</td>
             </tr>
           </table>
         </div>
diff --git a/netbox/templates/users/token.html b/netbox/templates/users/token.html
index fc52780f0..0fa8c572e 100644
--- a/netbox/templates/users/token.html
+++ b/netbox/templates/users/token.html
@@ -11,34 +11,46 @@
   <div class="row mb-3">
     <div class="col-md-6">
       <div class="card">
-        <h5 class="card-header">{% trans "User" %}</h5>
+        <h5 class="card-header">{% trans "Token" %}</h5>
         <div class="card-body">
           <table class="table table-hover attr-table">
             <tr>
               <th scope="row">{% trans "Key" %}</th>
-              <td>{{ object }}</td>
+              <td>{% if settings.ALLOW_TOKEN_RETRIEVAL %}{{ object.key }}{% else %}{{ object.partial }}{% endif %}</td>
             </tr>
             <tr>
               <th scope="row">{% trans "User" %}</th>
-              <td>{{ object.user }}</td>
-            </tr>
-            <tr>
-              <th scope="row">{% trans "Expires" %}</th>
-              <td>{{ object.expires|placeholder }}</td>
+              <td>
+                <a href="{% url 'users:netboxuser' pk=object.user.pk %}">{{ object.user }}</a>
+              </td>
             </tr>
             <tr>
               <th scope="row">{% trans "Description" %}</th>
               <td>{{ object.description|placeholder }}</td>
             </tr>
+            <tr>
+              <th scope="row">{% trans "Write enabled" %}</th>
+              <td>{% checkmark object.write_enabled %}</td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "Created" %}</th>
+              <td>{{ object.created|annotated_date }}</td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "Expires" %}</th>
+              <td>{{ object.expires|placeholder }}</td>
+            </tr>
+            <tr>
+              <th scope="row">{% trans "Last used" %}</th>
+              <td>{{ object.last_used|placeholder }}</td>
+            </tr>
             <tr>
               <th scope="row">{% trans "Allowed IPs" %}</th>
-              <td>{{ object.allowed_ips }}</td>
+              <td>{{ object.allowed_ips|join:", "|placeholder }}</td>
             </tr>
           </table>
         </div>
       </div>
     </div>
-    <div class="col-md-6">
-    </div>
   </div>
 {% endblock %}
diff --git a/netbox/users/migrations/0005_usertoken.py b/netbox/users/migrations/0005_usertoken.py
index 6b9f0d333..c6aef0590 100644
--- a/netbox/users/migrations/0005_usertoken.py
+++ b/netbox/users/migrations/0005_usertoken.py
@@ -18,6 +18,7 @@ class Migration(migrations.Migration):
                 'proxy': True,
                 'indexes': [],
                 'constraints': [],
+                'verbose_name': 'token',
             },
             bases=('users.token',),
         ),
diff --git a/netbox/users/models.py b/netbox/users/models.py
index 982b9f7bb..71434d5ce 100644
--- a/netbox/users/models.py
+++ b/netbox/users/models.py
@@ -328,6 +328,7 @@ class UserToken(Token):
     """
     class Meta:
         proxy = True
+        verbose_name = 'token'
 
     def get_absolute_url(self):
         return reverse('users:usertoken', args=[self.pk])
diff --git a/netbox/users/tables.py b/netbox/users/tables.py
index f411c077c..3ef885399 100644
--- a/netbox/users/tables.py
+++ b/netbox/users/tables.py
@@ -62,9 +62,9 @@ class UserTokenTable(NetBoxTable):
 
     class Meta(NetBoxTable.Meta):
         model = UserToken
-        fields = [
+        fields = (
             'pk', 'id', 'key', 'description', 'write_enabled', 'created', 'expires', 'last_used', 'allowed_ips',
-        ]
+        )
 
 
 class TokenTable(UserTokenTable):
@@ -78,9 +78,9 @@ class TokenTable(UserTokenTable):
 
     class Meta(NetBoxTable.Meta):
         model = Token
-        fields = [
+        fields = (
             'pk', 'id', 'key', 'user', 'description', 'write_enabled', 'created', 'expires', 'last_used', 'allowed_ips',
-        ]
+        )
 
 
 class UserTable(NetBoxTable):