diff --git a/pkg/social/generic_oauth.go b/pkg/social/generic_oauth.go
index 36b65ce2f4d..2411e0006a2 100644
--- a/pkg/social/generic_oauth.go
+++ b/pkg/social/generic_oauth.go
@@ -225,7 +225,7 @@ func (s *SocialGenericOAuth) UserInfo(client *http.Client, token *oauth2.Token)
 	return userInfo, nil
 }
 
-func (s *SocialGenericOAuth) extractToken(data *UserInfoJson, token *oauth2.Token) (bool) {
+func (s *SocialGenericOAuth) extractToken(data *UserInfoJson, token *oauth2.Token) bool {
 	idToken := token.Extra("id_token")
 	if idToken == nil {
 		s.log.Debug("No id_token found", "token", token)
diff --git a/pkg/social/social.go b/pkg/social/social.go
index 9f2fac4b09a..820f90ab01a 100644
--- a/pkg/social/social.go
+++ b/pkg/social/social.go
@@ -102,9 +102,9 @@ func NewOAuthService() {
 		// GitHub.
 		if name == "github" {
 			SocialMap["github"] = &SocialGithub{
-				SocialBase:           &SocialBase{
-					Config:               &config,
-					log:                  logger,
+				SocialBase: &SocialBase{
+					Config: &config,
+					log:    logger,
 				},
 				allowedDomains:       info.AllowedDomains,
 				apiUrl:               info.ApiUrl,
@@ -117,9 +117,9 @@ func NewOAuthService() {
 		// Google.
 		if name == "google" {
 			SocialMap["google"] = &SocialGoogle{
-				SocialBase:           &SocialBase{
-					Config:               &config,
-					log:                  logger,
+				SocialBase: &SocialBase{
+					Config: &config,
+					log:    logger,
 				},
 				allowedDomains: info.AllowedDomains,
 				hostedDomain:   info.HostedDomain,
@@ -131,9 +131,9 @@ func NewOAuthService() {
 		// Generic - Uses the same scheme as Github.
 		if name == "generic_oauth" {
 			SocialMap["generic_oauth"] = &SocialGenericOAuth{
-				SocialBase:           &SocialBase{
-					Config:               &config,
-					log:                  logger,
+				SocialBase: &SocialBase{
+					Config: &config,
+					log:    logger,
 				},
 				allowedDomains:       info.AllowedDomains,
 				apiUrl:               info.ApiUrl,
@@ -156,9 +156,9 @@ func NewOAuthService() {
 			}
 
 			SocialMap["grafana_com"] = &SocialGrafanaCom{
-				SocialBase:           &SocialBase{
-					Config:               &config,
-					log:                  logger,
+				SocialBase: &SocialBase{
+					Config: &config,
+					log:    logger,
 				},
 				url:                  setting.GrafanaComUrl,
 				allowSignup:          info.AllowSignup,