diff --git a/netbox/account/views.py b/netbox/account/views.py
index 2b1d64fe3..da4aa6d74 100644
--- a/netbox/account/views.py
+++ b/netbox/account/views.py
@@ -345,11 +345,9 @@ class UserTokenView(LoginRequiredMixin, View):
 
     def get(self, request, pk):
         token = get_object_or_404(UserToken.objects.filter(user=request.user), pk=pk)
-        key = token.key if token.v2 or settings.ALLOW_TOKEN_RETRIEVAL else None
 
         return render(request, 'account/token.html', {
             'object': token,
-            'key': key,
         })
 
 
diff --git a/netbox/users/tables.py b/netbox/users/tables.py
index c4b561164..c5207d899 100644
--- a/netbox/users/tables.py
+++ b/netbox/users/tables.py
@@ -11,7 +11,7 @@ __all__ = (
     'UserTable',
 )
 
-TOKEN = """<samp><span id="token_{{ record.pk }}">{{ record }}</span></samp>"""
+TOKEN = """<samp><a href="{{ record.get_absolute_url }}" id="token_{{ record.pk }}">{{ record }}</a></samp>"""
 
 COPY_BUTTON = """
 {% if settings.ALLOW_TOKEN_RETRIEVAL %}