diff --git a/grafana b/grafana
index 4572747bd60..017eab8dcd1 160000
--- a/grafana
+++ b/grafana
@@ -1 +1 @@
-Subproject commit 4572747bd60c688f7cc2cbf8a2303b9c95ad7b9d
+Subproject commit 017eab8dcd182b8c19f65657fc3d46e30545b7ff
diff --git a/pkg/api/login.go b/pkg/api/login.go
index 79f92b0d13b..d4bd3f2f99d 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -22,6 +22,10 @@ func LoginView(c *middleware.Context) {
 		return
 	}
 
+	settings := c.Data["Settings"].(map[string]interface{})
+	settings["googleAuthEnabled"] = setting.OAuthService.Google
+	settings["githubAuthEnabled"] = setting.OAuthService.GitHub
+
 	// Check auto-login.
 	uname := c.GetCookie(setting.CookieUserName)
 	if len(uname) == 0 {