diff --git a/grafana b/grafana
index 1c5f902770c..efe7279eade 160000
--- a/grafana
+++ b/grafana
@@ -1 +1 @@
-Subproject commit 1c5f902770c260f9bc63a0f07f1e9d22f60ce796
+Subproject commit efe7279eadeffc4ba9f5a7b340e4ecdf4d208218
diff --git a/pkg/services/sqlstore/tokens.go b/pkg/services/sqlstore/tokens.go
index 41bde590737..0282bad5df9 100644
--- a/pkg/services/sqlstore/tokens.go
+++ b/pkg/services/sqlstore/tokens.go
@@ -13,7 +13,7 @@ func init() {
 	bus.AddHandler("sql", GetTokenByToken)
 	bus.AddHandler("sql", UpdateToken)
 	bus.AddHandler("sql", DeleteToken)
-	bus.AddHandler("sql", DeleteToken)
+	bus.AddHandler("sql", AddToken)
 }
 
 func GetTokens(query *m.GetTokensQuery) error {
diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index 283d2fe2181..3076c7d21ba 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -12,6 +12,7 @@ import (
 
 func init() {
 	bus.AddHandler("sql", CreateUser)
+	bus.AddHandler("sql", UpdateUser)
 	bus.AddHandler("sql", GetUserByLogin)
 	bus.AddHandler("sql", SetUsingAccount)
 	bus.AddHandler("sql", GetUserInfo)
@@ -92,6 +93,21 @@ func GetUserByLogin(query *m.GetUserByLoginQuery) error {
 	return nil
 }
 
+func UpdateUser(cmd *m.UpdateUserCommand) error {
+	return inTransaction(func(sess *xorm.Session) error {
+
+		user := m.User{
+			Name:    cmd.Name,
+			Email:   cmd.Email,
+			Login:   cmd.Login,
+			Updated: time.Now(),
+		}
+
+		_, err := sess.Id(cmd.UserId).Update(&user)
+		return err
+	})
+}
+
 func SetUsingAccount(cmd *m.SetUsingAccountCommand) error {
 	return inTransaction(func(sess *xorm.Session) error {
 		user := m.User{}