diff --git a/netbox/templates/users/api_tokens.html b/netbox/templates/users/api_tokens.html
index 659b01a70..c0e5c55f9 100644
--- a/netbox/templates/users/api_tokens.html
+++ b/netbox/templates/users/api_tokens.html
@@ -10,8 +10,8 @@
                 <div class="panel panel-{% if token.is_expired %}danger{% else %}default{% endif %}">
                     <div class="panel-heading">
                         <div class="pull-right">
-                            <a href="{% url 'users:token_edit' pk=token.pk %}" class="btn btn-xs btn-warning">Edit</a>
-                            <a href="{% url 'users:token_delete' pk=token.pk %}" class="btn btn-xs btn-danger">Delete</a>
+                            <a href="{% url 'user:token_edit' pk=token.pk %}" class="btn btn-xs btn-warning">Edit</a>
+                            <a href="{% url 'user:token_delete' pk=token.pk %}" class="btn btn-xs btn-danger">Delete</a>
                         </div>
                         <i class="fa fa-key"></i> {{ token.key }}
                         {% if token.is_expired %}
@@ -49,7 +49,7 @@
             {% empty %}
                 <p>You do not have any API tokens.</p>
             {% endfor %}
-            <a href="{% url 'users:token_add' %}" class="btn btn-primary">
+            <a href="{% url 'user:token_add' %}" class="btn btn-primary">
                 <span class="fa fa-plus" aria-hidden="true"></span>
                 Add a token
             </a>
diff --git a/netbox/users/views.py b/netbox/users/views.py
index ee4d0161f..bf5706617 100644
--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -164,7 +164,7 @@ class TokenEditView(LoginRequiredMixin, View):
             'obj': token,
             'obj_type': token._meta.verbose_name,
             'form': form,
-            'return_url': reverse('users:token_list'),
+            'return_url': reverse('user:token_list'),
         })
 
     def post(self, request, pk=None):
@@ -183,7 +183,7 @@ class TokenEditView(LoginRequiredMixin, View):
             msg = "Token updated" if pk else "New token created"
             messages.success(request, msg)
 
-            return redirect('users:token_list')
+            return redirect('user:token_list')
 
 
 class TokenDeleteView(LoginRequiredMixin, View):
@@ -192,7 +192,7 @@ class TokenDeleteView(LoginRequiredMixin, View):
 
         token = get_object_or_404(Token.objects.filter(user=request.user), pk=pk)
         initial_data = {
-            'return_url': reverse('users:token_list'),
+            'return_url': reverse('user:token_list'),
         }
         form = ConfirmationForm(initial=initial_data)
 
@@ -200,7 +200,7 @@ class TokenDeleteView(LoginRequiredMixin, View):
             'obj': token,
             'obj_type': token._meta.verbose_name,
             'form': form,
-            'return_url': reverse('users:token_list'),
+            'return_url': reverse('user:token_list'),
         })
 
     def post(self, request, pk):
@@ -210,11 +210,11 @@ class TokenDeleteView(LoginRequiredMixin, View):
         if form.is_valid():
             token.delete()
             messages.success(request, "Token deleted")
-            return redirect('users:token_list')
+            return redirect('user:token_list')
 
         return render(request, 'utilities/obj_delete.html', {
             'obj': token,
             'obj_type': token._meta.verbose_name,
             'form': form,
-            'return_url': reverse('users:token_list'),
+            'return_url': reverse('user:token_list'),
         })