diff --git a/grafana b/grafana
index efe7279eade..590c3b4b501 160000
--- a/grafana
+++ b/grafana
@@ -1 +1 @@
-Subproject commit efe7279eadeffc4ba9f5a7b340e4ecdf4d208218
+Subproject commit 590c3b4b50195cacf02fbd0456d55ef69db16b79
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 3b4df8c3b39..c692ddd52ec 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -24,13 +24,13 @@ func Register(r *macaron.Macaron) {
 	r.Get("/login", Index)
 
 	// authed views
-	r.Get("/user/", reqSignedIn, Index)
+	r.Get("/profile/", reqSignedIn, Index)
 	r.Get("/account/", reqSignedIn, Index)
 	r.Get("/account/datasources/", reqSignedIn, Index)
-	r.Get("/account/collaborators/", reqSignedIn, Index)
+	r.Get("/account/users/", reqSignedIn, Index)
 	r.Get("/account/apikeys/", reqSignedIn, Index)
 	r.Get("/account/import/", reqSignedIn, Index)
-	r.Get("/admin", reqSignedIn, Index)
+	r.Get("/admin/users", reqSignedIn, Index)
 	r.Get("/dashboard/*", reqSignedIn, Index)
 
 	// sign up
@@ -49,8 +49,6 @@ func Register(r *macaron.Macaron) {
 
 		// account
 		r.Group("/account", func() {
-			//r.Get("/", GetAccount)
-			//r.Post("/", bind(m.UpdateAccountCommand{}), UpdateAccount)
 			r.Put("/users", bind(m.AddAccountUserCommand{}), AddAccountUser)
 			r.Get("/users", GetAccountUsers)
 			r.Delete("/users/:id", RemoveAccountUser)
diff --git a/pkg/models/account_user.go b/pkg/models/account_user.go
index c1ca89590e7..fc0995af2a2 100644
--- a/pkg/models/account_user.go
+++ b/pkg/models/account_user.go
@@ -58,8 +58,8 @@ type GetAccountUsersQuery struct {
 // Projections and DTOs
 
 type AccountUserDTO struct {
-	AccountId int64  `json:"account_id"`
-	UserId    int64  `json:"user_id"`
+	AccountId int64  `json:"accountId"`
+	UserId    int64  `json:"userId"`
 	Email     string `json:"email"`
 	Login     string `json:"login"`
 	Role      string `json:"role"`