diff --git a/grafana b/grafana
index 7fef460fa2b..dfef4727b68 160000
--- a/grafana
+++ b/grafana
@@ -1 +1 @@
-Subproject commit 7fef460fa2b6034429b205dc63d9b9f298f43fb4
+Subproject commit dfef4727b689d408b86d75c575646705bac79496
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 6ab2b77a9d5..0ae9ce5a055 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -23,6 +23,10 @@ func setIndexViewData(c *middleware.Context) error {
 		IsGrafanaAdmin: c.IsGrafanaAdmin,
 	}
 
+	if len(currentUser.Name) == 0 {
+		currentUser.Name = currentUser.Login
+	}
+
 	c.Data["User"] = currentUser
 	c.Data["Settings"] = settings
 	c.Data["AppUrl"] = setting.AppUrl