diff --git a/pkg/social/social.go b/pkg/social/social.go
index 402f02449ff..3c970f89e4f 100644
--- a/pkg/social/social.go
+++ b/pkg/social/social.go
@@ -42,7 +42,7 @@ func NewOAuthService() {
 	setting.OAuthService = &setting.OAuther{}
 	setting.OAuthService.OAuthInfos = make(map[string]*setting.OAuthInfo)
 
-	allOauthes := []string{"github", "google", "generic-oauth"}
+	allOauthes := []string{"github", "google", "generic_oauth"}
 
 	for _, name := range allOauthes {
 		sec := setting.Cfg.Section("auth." + name)
@@ -100,12 +100,12 @@ func NewOAuthService() {
 		}
 
 		// Generic - Uses the same scheme as Github.
-		if name == "generic-oauth" {
+		if name == "generic_oauth" {
 			setting.OAuthService.Generic = true
 			setting.OAuthService.OAuthProviderName = sec.Key("oauth_provider_name").String()
 			teamIds := sec.Key("team_ids").Ints(",")
 			allowedOrganizations := sec.Key("allowed_organizations").Strings(" ")
-			SocialMap["generic-oauth"] = &SocialGithub{
+			SocialMap["generic_oauth"] = &SocialGithub{
 				Config:               &config,
 				allowedDomains:       info.AllowedDomains,
 				apiUrl:               info.ApiUrl,
diff --git a/public/app/partials/login.html b/public/app/partials/login.html
index 200200ee4b9..f4f5fb26d7e 100644
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -59,7 +59,7 @@
 						<i class="fa fa-github"></i>
 						with Github
 					</a>
-					<a class="btn btn-large btn-generic-oauth" href="login/generic-oauth" target="_self" ng-if="genericOAuthEnabled">
+					<a class="btn btn-large btn-generic-oauth" href="login/generic_oauth" target="_self" ng-if="genericOAuthEnabled">
 						<i class="fa fa-gear"></i>
             with {{oauthProviderName || "OAuth 2"}}
           </a>