diff --git a/pkg/api/api.go b/pkg/api/api.go
index 4595869ab0b..4da20db956f 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -31,6 +31,8 @@ func Register(r *macaron.Macaron) {
 	r.Get("/account/apikeys/", reqSignedIn, Index)
 	r.Get("/account/import/", reqSignedIn, Index)
 	r.Get("/admin/users", reqGrafanaAdmin, Index)
+	r.Get("/admin/users/create", reqGrafanaAdmin, Index)
+	r.Get("/admin/users/edit/:id", reqGrafanaAdmin, Index)
 	r.Get("/dashboard/*", reqSignedIn, Index)
 
 	// sign up
diff --git a/src/app/features/admin/partials/edit_user.html b/src/app/features/admin/partials/edit_user.html
index 4209b280d5b..e9db377df5a 100644
--- a/src/app/features/admin/partials/edit_user.html
+++ b/src/app/features/admin/partials/edit_user.html
@@ -2,8 +2,8 @@
 	<ul class="nav">
 		<li><a href="admin">Settings</a></li>
 		<li><a href="admin/users">Users</a></li>
-		<li ng-class="{active: createMode}"><a href="admin/users/new">Create user</a></li>
-		<li class="active" ng-show="!createMode"><a href="admin/users/new">Edit user</a></li>
+		<li ng-class="{active: createMode}"><a href="admin/users/create">Create user</a></li>
+		<li class="active" ng-show="!createMode"><a href="admin/users/edit/{{user_id}}">Edit user</a></li>
 	</ul>
 </topnav>