diff --git a/grafana b/grafana
index d3cc6e518df..aaa717aac2c 160000
--- a/grafana
+++ b/grafana
@@ -1 +1 @@
-Subproject commit d3cc6e518dfd2ceb26c0e568bc603b4473b11a02
+Subproject commit aaa717aac2c1f5e440d61cbe08e55357b4d2570b
diff --git a/pkg/api/api.go b/pkg/api/api.go
index f2e3cd7cea2..07af68cb789 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -25,6 +25,8 @@ func Register(r *macaron.Macaron) {
 	// authed views
 	r.Get("/account/", reqSignedIn, Index)
 	r.Get("/account/datasources/", reqSignedIn, Index)
+	r.Get("/account/collaborators/", reqSignedIn, Index)
+	r.Get("/account/apikeys/", reqSignedIn, Index)
 	r.Get("/admin", reqSignedIn, Index)
 	r.Get("/dashboard/*", reqSignedIn, Index)
 
diff --git a/pkg/api/token.go b/pkg/api/token.go
index 2cd6f98e051..1252f0e6f23 100644
--- a/pkg/api/token.go
+++ b/pkg/api/token.go
@@ -8,7 +8,7 @@ import (
 )
 
 func GetTokens(c *middleware.Context) {
-	query := m.GetTokensQuery{AccountId: c.Account.Id}
+	query := m.GetTokensQuery{AccountId: c.UserAccount.Id}
 	err := bus.Dispatch(&query)
 
 	if err != nil {
@@ -47,7 +47,7 @@ func AddToken(c *middleware.Context, cmd m.AddTokenCommand) {
 		return
 	}
 
-	cmd.AccountId = c.Account.Id
+	cmd.AccountId = c.UserAccount.Id
 	cmd.Token = util.GetRandomString(64)
 
 	if err := bus.Dispatch(&cmd); err != nil {
@@ -71,7 +71,7 @@ func UpdateToken(c *middleware.Context, cmd m.UpdateTokenCommand) {
 		return
 	}
 
-	cmd.AccountId = c.Account.Id
+	cmd.AccountId = c.UserAccount.Id
 
 	err := bus.Dispatch(&cmd)
 	if err != nil {
diff --git a/pkg/models/account.go b/pkg/models/account.go
index ff499dd0fae..ffd3b701c65 100644
--- a/pkg/models/account.go
+++ b/pkg/models/account.go
@@ -6,7 +6,6 @@ import (
 )
 
 // Typed errors
-
 var (
 	ErrAccountNotFound = errors.New("Account not found")
 )