diff --git a/src/app/components/settings.js b/src/app/components/settings.js
index 9bef2757d9f..3be2292e16a 100644
--- a/src/app/components/settings.js
+++ b/src/app/components/settings.js
@@ -34,12 +34,7 @@ function (_, crypto) {
}
};
- // This initializes a new hash on purpose, to avoid adding parameters to
- // config.js without providing sane defaults
- var settings = {};
- _.each(defaults, function(value, key) {
- settings[key] = typeof options[key] !== 'undefined' ? options[key] : defaults[key];
- });
+ var settings = _.extend(options, defaults);
var parseBasicAuth = function(datasource) {
var passwordEnd = datasource.url.indexOf('@');
diff --git a/src/app/controllers/loginCtrl.js b/src/app/controllers/loginCtrl.js
index c3696d55124..e6b0f99f867 100644
--- a/src/app/controllers/loginCtrl.js
+++ b/src/app/controllers/loginCtrl.js
@@ -16,6 +16,10 @@ function (angular, config) {
};
$scope.grafana.sidemenu = false;
+
+ $scope.googleAuthEnabled = config.googleAuthEnabled;
+ $scope.githubAuthEnabled = config.githubAuthEnabled;
+
$scope.loginMode = true;
$scope.submitBtnClass = 'btn-inverse';
$scope.submitBtnText = 'Log in';
diff --git a/src/app/partials/login.html b/src/app/partials/login.html
index d96b4d1f952..e57cb2531af 100644
--- a/src/app/partials/login.html
+++ b/src/app/partials/login.html
@@ -80,11 +80,11 @@