diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index cc07b9cfb49..98e26ed9aeb 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -111,6 +111,7 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
"datasources": datasources,
"appSubUrl": setting.AppSubUrl,
"allowOrgCreate": (setting.AllowUserOrgCreate && c.IsSignedIn) || c.IsGrafanaAdmin,
+ "authProxyEnabled": setting.AuthProxyEnabled,
"buildInfo": map[string]interface{}{
"version": setting.BuildVersion,
"commit": setting.BuildCommit,
diff --git a/public/app/core/controllers/sidemenu_ctrl.js b/public/app/core/controllers/sidemenu_ctrl.js
index c2ee868323f..87cd26a43fa 100644
--- a/public/app/core/controllers/sidemenu_ctrl.js
+++ b/public/app/core/controllers/sidemenu_ctrl.js
@@ -120,6 +120,7 @@ function (angular, _, $, coreModule, config) {
};
$scope.init = function() {
+ $scope.showSignup = contextSrv.isSignedIn && !config['authProxyEnabled'];
$scope.updateMenu();
$scope.$on('$routeChangeSuccess', $scope.updateMenu);
};
diff --git a/public/app/partials/sidemenu.html b/public/app/partials/sidemenu.html
index f73ef658fba..d69c877f962 100644
--- a/public/app/partials/sidemenu.html
+++ b/public/app/partials/sidemenu.html
@@ -60,8 +60,7 @@
-
-
+
-
+