diff --git a/pkg/api/login.go b/pkg/api/login.go
index 463fa8282a5..93a6d114704 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -29,6 +29,7 @@ func LoginView(c *middleware.Context) {
viewData.Settings["githubAuthEnabled"] = setting.OAuthService.GitHub
viewData.Settings["disableUserSignUp"] = !setting.AllowUserSignUp
viewData.Settings["loginHint"] = setting.LoginHint
+ viewData.Settings["oauthOnly"] = setting.DisableUserPassLogin
if !tryLoginUsingRememberCookie(c) {
c.HTML(200, VIEW_INDEX, viewData)
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 6c425505289..5a6b63a1de8 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -82,13 +82,14 @@ var (
ExternalEnabled bool
// User settings
- AllowUserSignUp bool
- AllowUserOrgCreate bool
- AutoAssignOrg bool
- AutoAssignOrgRole string
- VerifyEmailEnabled bool
- LoginHint string
- DefaultTheme string
+ AllowUserSignUp bool
+ AllowUserOrgCreate bool
+ AutoAssignOrg bool
+ AutoAssignOrgRole string
+ VerifyEmailEnabled bool
+ LoginHint string
+ DefaultTheme string
+ DisableUserPassLogin bool
// Http auth
AdminUser string
@@ -485,6 +486,7 @@ func NewConfigContext(args *CommandLineArgs) error {
VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false)
LoginHint = users.Key("login_hint").String()
DefaultTheme = users.Key("default_theme").String()
+ DisableUserPassLogin = users.Key("disable_user_pass_login").MustBool(false)
// anonymous access
AnonymousEnabled = Cfg.Section("auth.anonymous").Key("enabled").MustBool(false)
diff --git a/public/app/core/controllers/login_ctrl.js b/public/app/core/controllers/login_ctrl.js
index 45a47558ed7..2be5f6b1740 100644
--- a/public/app/core/controllers/login_ctrl.js
+++ b/public/app/core/controllers/login_ctrl.js
@@ -18,6 +18,7 @@ function (angular, coreModule, config) {
$scope.googleAuthEnabled = config.googleAuthEnabled;
$scope.githubAuthEnabled = config.githubAuthEnabled;
$scope.oauthEnabled = config.githubAuthEnabled || config.googleAuthEnabled;
+ $scope.oauthOnly = config.oauthOnly;
$scope.disableUserSignUp = config.disableUserSignUp;
$scope.loginHint = config.loginHint;
diff --git a/public/app/partials/login.html b/public/app/partials/login.html
index 8143ff35125..660206ede59 100644
--- a/public/app/partials/login.html
+++ b/public/app/partials/login.html
@@ -17,7 +17,7 @@
-