diff --git a/ui/src/kapacitor/components/HandlerEmpty.js b/ui/src/kapacitor/components/HandlerEmpty.js
index 46b3aff681..cc3348494b 100644
--- a/ui/src/kapacitor/components/HandlerEmpty.js
+++ b/ui/src/kapacitor/components/HandlerEmpty.js
@@ -5,7 +5,7 @@ const HandlerEmpty = ({onGoToConfig, validationError}) => (
   <div className="endpoint-tab-contents">
     <div className="endpoint-tab--parameters">
       <div className="endpoint-tab--parameters--empty">
-        <p>This handler has not been configured</p>
+        <p>This handler is not enabled</p>
         <div className="form-group form-group-submit col-xs-12 text-center">
           <button
             className="btn btn-primary"
diff --git a/ui/src/kapacitor/components/config/AlertaConfig.tsx b/ui/src/kapacitor/components/config/AlertaConfig.tsx
index cb0d06d21e..582bae25cf 100644
--- a/ui/src/kapacitor/components/config/AlertaConfig.tsx
+++ b/ui/src/kapacitor/components/config/AlertaConfig.tsx
@@ -109,7 +109,7 @@ class AlertaConfig extends PureComponent<Props, State> {
               checked={enabled}
               onChange={this.handleEnabledChange}
             />
-            <label htmlFor="disabled">Enable configuration</label>
+            <label htmlFor="disabled">Configuration Enabled</label>
           </div>
         </div>
 
diff --git a/ui/src/kapacitor/components/config/HipChatConfig.tsx b/ui/src/kapacitor/components/config/HipChatConfig.tsx
index 4ac24829c6..8ee74b733c 100644
--- a/ui/src/kapacitor/components/config/HipChatConfig.tsx
+++ b/ui/src/kapacitor/components/config/HipChatConfig.tsx
@@ -106,7 +106,7 @@ class HipchatConfig extends PureComponent<Props, State> {
               checked={enabled}
               onChange={this.handleEnabledChange}
             />
-            <label htmlFor="disabled">Enable configuration</label>
+            <label htmlFor="disabled">Configuration Enabled</label>
           </div>
         </div>
 
diff --git a/ui/src/kapacitor/components/config/OpsGenieConfig.tsx b/ui/src/kapacitor/components/config/OpsGenieConfig.tsx
index badc611d49..278d8677e2 100644
--- a/ui/src/kapacitor/components/config/OpsGenieConfig.tsx
+++ b/ui/src/kapacitor/components/config/OpsGenieConfig.tsx
@@ -96,7 +96,7 @@ class OpsGenieConfig extends PureComponent<Props, State> {
               checked={enabled}
               onChange={this.handleEnabledChange}
             />
-            <label htmlFor="disabled">Enable configuration</label>
+            <label htmlFor="disabled">Configuration Enabled</label>
           </div>
         </div>
 
diff --git a/ui/src/kapacitor/components/config/PagerDutyConfig.tsx b/ui/src/kapacitor/components/config/PagerDutyConfig.tsx
index d6dea46c53..d3b0df21af 100644
--- a/ui/src/kapacitor/components/config/PagerDutyConfig.tsx
+++ b/ui/src/kapacitor/components/config/PagerDutyConfig.tsx
@@ -80,7 +80,7 @@ class PagerDutyConfig extends PureComponent<Props, State> {
               checked={enabled}
               onChange={this.handleEnabledChange}
             />
-            <label htmlFor="disabled">Enable configuration</label>
+            <label htmlFor="disabled">Configuration Enabled</label>
           </div>
         </div>
 
@@ -88,14 +88,14 @@ class PagerDutyConfig extends PureComponent<Props, State> {
           <button
             className="btn btn-primary"
             type="submit"
-            disabled={this.state.testEnabled || !enabled}
+            disabled={this.state.testEnabled}
           >
             <span className="icon checkmark" />
             Save Changes
           </button>
           <button
             className="btn btn-primary"
-            disabled={!this.state.testEnabled}
+            disabled={!this.state.testEnabled || !enabled}
             onClick={this.props.onTest}
           >
             <span className="icon pulse-c" />
diff --git a/ui/src/kapacitor/components/config/PushoverConfig.tsx b/ui/src/kapacitor/components/config/PushoverConfig.tsx
index 3bef06fe09..71e55600f6 100644
--- a/ui/src/kapacitor/components/config/PushoverConfig.tsx
+++ b/ui/src/kapacitor/components/config/PushoverConfig.tsx
@@ -110,7 +110,7 @@ class PushoverConfig extends PureComponent<Props, State> {
               checked={enabled}
               onChange={this.handleEnabledChange}
             />
-            <label htmlFor="disabled">Enable configuration</label>
+            <label htmlFor="disabled">Configuration Enabled</label>
           </div>
         </div>
 
diff --git a/ui/src/kapacitor/components/config/SMTPConfig.tsx b/ui/src/kapacitor/components/config/SMTPConfig.tsx
index 26d584f10c..3a600466c4 100644
--- a/ui/src/kapacitor/components/config/SMTPConfig.tsx
+++ b/ui/src/kapacitor/components/config/SMTPConfig.tsx
@@ -144,7 +144,7 @@ class SMTPConfig extends PureComponent<Props, State> {
               checked={enabled}
               onChange={this.handleEnabledChange}
             />
-            <label htmlFor="disabled">Enable configuration</label>
+            <label htmlFor="disabled">Configuration Enabled</label>
           </div>
         </div>
 
diff --git a/ui/src/kapacitor/components/config/SensuConfig.tsx b/ui/src/kapacitor/components/config/SensuConfig.tsx
index 6e8f93db3b..d47e7bb045 100644
--- a/ui/src/kapacitor/components/config/SensuConfig.tsx
+++ b/ui/src/kapacitor/components/config/SensuConfig.tsx
@@ -78,7 +78,7 @@ class SensuConfig extends PureComponent<Props, State> {
               checked={enabled}
               onChange={this.handleEnabledChange}
             />
-            <label htmlFor="disabled">Enable configuration</label>
+            <label htmlFor="disabled">Configuration Enabled</label>
           </div>
         </div>
 
diff --git a/ui/src/kapacitor/components/config/SlackConfig.tsx b/ui/src/kapacitor/components/config/SlackConfig.tsx
index 35bb47eada..40be3d6fab 100644
--- a/ui/src/kapacitor/components/config/SlackConfig.tsx
+++ b/ui/src/kapacitor/components/config/SlackConfig.tsx
@@ -85,7 +85,7 @@ class SlackConfig extends PureComponent<Props, State> {
               checked={enabled}
               onChange={this.handleEnabledChange}
             />
-            <label htmlFor="disabled">Enable configuration</label>
+            <label htmlFor="disabled">Configuration Enabled</label>
           </div>
         </div>
 
diff --git a/ui/src/kapacitor/components/config/TalkConfig.tsx b/ui/src/kapacitor/components/config/TalkConfig.tsx
index ef6438add1..771a651135 100644
--- a/ui/src/kapacitor/components/config/TalkConfig.tsx
+++ b/ui/src/kapacitor/components/config/TalkConfig.tsx
@@ -79,7 +79,7 @@ class TalkConfig extends PureComponent<Props, State> {
               checked={enabled}
               onChange={this.handleEnabledChange}
             />
-            <label htmlFor="disabled">Enable configuration</label>
+            <label htmlFor="disabled">Configuration Enabled</label>
           </div>
         </div>
 
diff --git a/ui/src/kapacitor/components/config/TelegramConfig.tsx b/ui/src/kapacitor/components/config/TelegramConfig.tsx
index 0ea31e4e14..903a5cf9b8 100644
--- a/ui/src/kapacitor/components/config/TelegramConfig.tsx
+++ b/ui/src/kapacitor/components/config/TelegramConfig.tsx
@@ -189,7 +189,7 @@ class TelegramConfig extends PureComponent<Props, State> {
               checked={enabled}
               onChange={this.handleEnabledChange}
             />
-            <label htmlFor="disabled">Enable configuration</label>
+            <label htmlFor="disabled">Configuration Enabled</label>
           </div>
         </div>
 
diff --git a/ui/src/kapacitor/components/config/VictorOpsConfig.tsx b/ui/src/kapacitor/components/config/VictorOpsConfig.tsx
index d0391919e2..268a0ebe1c 100644
--- a/ui/src/kapacitor/components/config/VictorOpsConfig.tsx
+++ b/ui/src/kapacitor/components/config/VictorOpsConfig.tsx
@@ -97,7 +97,7 @@ class VictorOpsConfig extends PureComponent<Props, State> {
               checked={enabled}
               onChange={this.handleEnabledChange}
             />
-            <label htmlFor="disabled">Enable configuration</label>
+            <label htmlFor="disabled">Configuration Enabled</label>
           </div>
         </div>