diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py
index bbfdee58d..9b1f81dad 100644
--- a/netbox/netbox/urls.py
+++ b/netbox/netbox/urls.py
@@ -23,7 +23,7 @@ _patterns = [
     url(r'^ipam/', include('ipam.urls', namespace='ipam')),
     url(r'^secrets/', include('secrets.urls', namespace='secrets')),
     url(r'^tenancy/', include('tenancy.urls', namespace='tenancy')),
-    url(r'^profile/', include('users.urls', namespace='users')),
+    url(r'^user/', include('users.urls', namespace='user')),
 
     # API
     url(r'^api/circuits/', include('circuits.api.urls', namespace='circuits-api')),
diff --git a/netbox/secrets/decorators.py b/netbox/secrets/decorators.py
index 41af204da..683805124 100644
--- a/netbox/secrets/decorators.py
+++ b/netbox/secrets/decorators.py
@@ -15,10 +15,10 @@ def userkey_required():
                 uk = UserKey.objects.get(user=request.user)
             except UserKey.DoesNotExist:
                 messages.warning(request, u"This operation requires an active user key, but you don't have one.")
-                return redirect('users:userkey')
+                return redirect('user:userkey')
             if not uk.is_active():
                 messages.warning(request, u"This operation is not available. Your user key has not been activated.")
-                return redirect('users:userkey')
+                return redirect('user:userkey')
             return view(request, *args, **kwargs)
         return wrapped_view
     return _decorator
diff --git a/netbox/templates/_base.html b/netbox/templates/_base.html
index d1090a5fb..6f0dfced6 100644
--- a/netbox/templates/_base.html
+++ b/netbox/templates/_base.html
@@ -245,7 +245,7 @@
                         {% if request.user.is_staff %}
                             <li><a href="{% url 'admin:index' %}"><i class="fa fa-cogs" aria-hidden="true"></i> Admin</a></li>
                         {% endif %}
-                        <li><a href="{% url 'users:profile' %}"><i class="fa fa-user" aria-hidden="true"></i> {{ request.user }}</a></li>
+                        <li><a href="{% url 'user:profile' %}"><i class="fa fa-user" aria-hidden="true"></i> {{ request.user }}</a></li>
                         <li><a href="{% url 'logout' %}"><i class="fa fa-sign-out" aria-hidden="true"></i> Log out</a></li>
                     {% else %}
                         <li><a href="{% url 'login' %}?next={{ request.path }}"><i class="fa fa-sign-in" aria-hidden="true"></i> Log in</a></li>
diff --git a/netbox/templates/users/_user.html b/netbox/templates/users/_user.html
index 01978a59e..a2e18daed 100644
--- a/netbox/templates/users/_user.html
+++ b/netbox/templates/users/_user.html
@@ -9,10 +9,10 @@
 <div class="row">
     <div class="col-sm-3 col-md-2 col-md-offset-2">
         <ul class="nav nav-pills nav-stacked">
-            <li{% ifequal active_tab "profile" %} class="active"{% endifequal %}><a href="{% url 'users:profile' %}">Profile</a></li>
-            <li{% ifequal active_tab "change_password" %} class="active"{% endifequal %}><a href="{% url 'users:change_password' %}">Change Password</a></li>
-            <li{% ifequal active_tab "userkey" %} class="active"{% endifequal %}><a href="{% url 'users:userkey' %}">User Key</a></li>
-            <li{% ifequal active_tab "recent_activity" %} class="active"{% endifequal %}><a href="{% url 'users:recent_activity' %}">Recent Activity</a></li>
+            <li{% ifequal active_tab "profile" %} class="active"{% endifequal %}><a href="{% url 'user:profile' %}">Profile</a></li>
+            <li{% ifequal active_tab "change_password" %} class="active"{% endifequal %}><a href="{% url 'user:change_password' %}">Change Password</a></li>
+            <li{% ifequal active_tab "userkey" %} class="active"{% endifequal %}><a href="{% url 'user:userkey' %}">User Key</a></li>
+            <li{% ifequal active_tab "recent_activity" %} class="active"{% endifequal %}><a href="{% url 'user:recent_activity' %}">Recent Activity</a></li>
         </ul>
     </div>
 	<div class="col-sm-9 col-md-6">
diff --git a/netbox/templates/users/change_password.html b/netbox/templates/users/change_password.html
index 80528c981..700bf682d 100644
--- a/netbox/templates/users/change_password.html
+++ b/netbox/templates/users/change_password.html
@@ -24,7 +24,7 @@
         </div>
         <div class="text-right">
             <button type="submit" name="_update" class="btn btn-primary">Update</button>
-            <a href="{% url 'users:profile' %}" class="btn btn-default">Cancel</a>
+            <a href="{% url 'user:profile' %}" class="btn btn-default">Cancel</a>
         </div>
     </form>
 {% endblock %}
diff --git a/netbox/templates/users/userkey.html b/netbox/templates/users/userkey.html
index 08c519c2d..df5e55be9 100644
--- a/netbox/templates/users/userkey.html
+++ b/netbox/templates/users/userkey.html
@@ -15,7 +15,7 @@
         <p>Your public key is below.</p>
         <pre>{{ userkey.public_key }}</pre>
         <div class="pull-right">
-            <a href="{% url 'users:userkey_edit' %}" class="btn btn-warning">
+            <a href="{% url 'user:userkey_edit' %}" class="btn btn-warning">
                 <span class="fa fa-pencil" aria-hidden="true"></span>
                 Edit user key
             </a>
@@ -24,7 +24,7 @@
     {% else %}
         <p>You don't have a user key on file.</p>
         <p>
-            <a href="{% url 'users:userkey_edit' %}" class="btn btn-primary">
+            <a href="{% url 'user:userkey_edit' %}" class="btn btn-primary">
                 <span class="fa fa-plus" aria-hidden="true"></span>
                 Create a User Key
             </a>
diff --git a/netbox/templates/users/userkey_edit.html b/netbox/templates/users/userkey_edit.html
index 550ade4c2..45bac1938 100644
--- a/netbox/templates/users/userkey_edit.html
+++ b/netbox/templates/users/userkey_edit.html
@@ -23,7 +23,7 @@
                 </div>
                 <div class="col-sm-6 col-md-6 text-right">
                     <button type="submit" name="_update" class="btn btn-primary">Save</button>
-                    <a href="{% url 'users:userkey' %}" class="btn btn-default">Cancel</a>
+                    <a href="{% url 'user:userkey' %}" class="btn btn-default">Cancel</a>
                 </div>
             </div>
         </div>
diff --git a/netbox/users/urls.py b/netbox/users/urls.py
index d33d14beb..a9f7a1d7f 100644
--- a/netbox/users/urls.py
+++ b/netbox/users/urls.py
@@ -7,9 +7,9 @@ urlpatterns = [
 
     # User profiles
     url(r'^profile/$', views.profile, name='profile'),
-    url(r'^profile/password/$', views.change_password, name='change_password'),
-    url(r'^profile/user-key/$', views.userkey, name='userkey'),
-    url(r'^profile/user-key/edit/$', views.userkey_edit, name='userkey_edit'),
-    url(r'^profile/recent-activity/$', views.recent_activity, name='recent_activity'),
+    url(r'^password/$', views.change_password, name='change_password'),
+    url(r'^user-key/$', views.userkey, name='userkey'),
+    url(r'^user-key/edit/$', views.userkey_edit, name='userkey_edit'),
+    url(r'^recent-activity/$', views.recent_activity, name='recent_activity'),
 
 ]
diff --git a/netbox/users/views.py b/netbox/users/views.py
index 95f5f3bfc..12a714696 100644
--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -69,7 +69,7 @@ def change_password(request):
             form.save()
             update_session_auth_hash(request, form.user)
             messages.success(request, u"Your password has been changed successfully.")
-            return redirect('users:profile')
+            return redirect('user:profile')
 
     else:
         form = PasswordChangeForm(user=request.user)
@@ -109,7 +109,7 @@ def userkey_edit(request):
             uk.user = request.user
             uk.save()
             messages.success(request, u"Your user key has been saved.")
-            return redirect('users:userkey')
+            return redirect('user:userkey')
 
     else:
         form = UserKeyForm(instance=userkey)