diff --git a/api/views.py b/api/views.py
index 5a119f9..2aeb4de 100644
--- a/api/views.py
+++ b/api/views.py
@@ -98,7 +98,6 @@ class TokenDeleteView(DashboardView, DeleteView):
     model = Token
 
     def get(self, request, *args, **kwargs):
-        # self.check_valid_user()
         self.pk = kwargs['pk']
         self.object = get_object_or_404(self.model, pk=self.pk)
         self.object.delete()
@@ -109,8 +108,7 @@ class TokenDeleteView(DashboardView, DeleteView):
 class TokenNewView(DashboardView, View):
 
     def get(self, request, *args, **kwargs):
-        # self.check_valid_user()
-        Token.objects.create(token=uuid4())
+        Token.objects.create(token=uuid4(), owner=self.request.user)
 
         return redirect('api:tokens')
             
diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html
index f4a9307..318c890 100644
--- a/dashboard/templates/base.html
+++ b/dashboard/templates/base.html
@@ -144,7 +144,7 @@
                 </ul>
               </li>
               <li class="nav-item">
-                <a class="nav-link fw-bold" href="{# url 'api:tokens' #}">
+                <a class="nav-link fw-bold" href="{% url 'api:tokens' %}">
                   <i class="bi-menu-button-wide icon_sidebar"></i>
                   {% trans 'Tokens' %}
                 </a>