diff --git a/conf/defaults.ini b/conf/defaults.ini
index d47cefd6bf6..cbc239937c6 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -405,7 +405,8 @@ global_session = -1
 #   \______(_______;;;)__;;;)
 
 [alerting]
-enabled = true
+# Makes it possible to turn off alert rule execution.
+execute_alerts = true
 
 #################################### Internal Grafana Metrics ############
 # Metrics available at HTTP API Url /api/metrics
diff --git a/conf/sample.ini b/conf/sample.ini
index dee40c6f2e9..e1ed408210a 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -355,7 +355,8 @@
 #   \______(_______;;;)__;;;)
 
 [alerting]
-;enabled = false
+# Makes it possible to turn off alert rule execution.
+;execute_alerts = true
 
 #################################### Internal Grafana Metrics ##########################
 # Metrics available at HTTP API Url /api/metrics
diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index 1812226aa90..29a38e43bd6 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -153,16 +153,14 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response {
 		return ApiError(500, "Failed to save dashboard", err)
 	}
 
-	if setting.AlertingEnabled {
-		alertCmd := alerting.UpdateDashboardAlertsCommand{
-			OrgId:     c.OrgId,
-			UserId:    c.UserId,
-			Dashboard: cmd.Result,
-		}
+	alertCmd := alerting.UpdateDashboardAlertsCommand{
+		OrgId:     c.OrgId,
+		UserId:    c.UserId,
+		Dashboard: cmd.Result,
+	}
 
-		if err := bus.Dispatch(&alertCmd); err != nil {
-			return ApiError(500, "Failed to save alerts", err)
-		}
+	if err := bus.Dispatch(&alertCmd); err != nil {
+		return ApiError(500, "Failed to save alerts", err)
 	}
 
 	c.TimeRequest(metrics.M_Api_Dashboard_Save)
diff --git a/pkg/api/frontendsettings.go b/pkg/api/frontendsettings.go
index 5a324aa1331..d599dd10735 100644
--- a/pkg/api/frontendsettings.go
+++ b/pkg/api/frontendsettings.go
@@ -145,7 +145,6 @@ func getFrontendSettingsMap(c *middleware.Context) (map[string]interface{}, erro
 			"hasUpdate":     plugins.GrafanaHasUpdate,
 			"env":           setting.Env,
 		},
-		"alertingEnabled": setting.AlertingEnabled,
 	}
 
 	return jsonObj, nil
diff --git a/pkg/api/index.go b/pkg/api/index.go
index 385810b942e..99a5f78f9c9 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -102,7 +102,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 		Children: dashboardChildNavs,
 	})
 
-	if setting.AlertingEnabled && (c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR) {
+	if c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR {
 		alertChildNavs := []*dtos.NavLink{
 			{Text: "Alert List", Url: setting.AppSubUrl + "/alerting/list"},
 			{Text: "Notifications", Url: setting.AppSubUrl + "/alerting/notifications"},
diff --git a/pkg/cmd/grafana-server/server.go b/pkg/cmd/grafana-server/server.go
index 0b8628602a7..2a4682cbb4b 100644
--- a/pkg/cmd/grafana-server/server.go
+++ b/pkg/cmd/grafana-server/server.go
@@ -59,7 +59,7 @@ func (g *GrafanaServerImpl) Start() {
 	plugins.Init()
 
 	// init alerting
-	if setting.AlertingEnabled {
+	if setting.ExecuteAlerts {
 		engine := alerting.NewEngine()
 		g.childRoutines.Go(func() error { return engine.Run(g.context) })
 	}
diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go
index 3086e7b9239..28eaaa5b5d5 100644
--- a/pkg/setting/setting.go
+++ b/pkg/setting/setting.go
@@ -145,7 +145,7 @@ var (
 	Quota QuotaSettings
 
 	// Alerting
-	AlertingEnabled bool
+	ExecuteAlerts bool
 
 	// logger
 	logger log.Logger
@@ -555,7 +555,7 @@ func NewConfigContext(args *CommandLineArgs) error {
 	LdapAllowSignup = ldapSec.Key("allow_sign_up").MustBool(true)
 
 	alerting := Cfg.Section("alerting")
-	AlertingEnabled = alerting.Key("enabled").MustBool(false)
+	ExecuteAlerts = alerting.Key("execute_alerts").MustBool(true)
 
 	readSessionConfig()
 	readSmtpSettings()
diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
index 8d392c0d5c1..0b8fea1d176 100644
--- a/public/app/plugins/panel/graph/module.ts
+++ b/public/app/plugins/panel/graph/module.ts
@@ -133,10 +133,8 @@ class GraphCtrl extends MetricsPanelCtrl {
     this.addEditorTab('Axes', axesEditorComponent, 2);
     this.addEditorTab('Legend', 'public/app/plugins/panel/graph/tab_legend.html', 3);
     this.addEditorTab('Display', 'public/app/plugins/panel/graph/tab_display.html', 4);
+    this.addEditorTab('Alert', alertTab, 5);
 
-    if (config.alertingEnabled) {
-      this.addEditorTab('Alert', alertTab, 5);
-    }
     this.subTabIndex = 0;
   }