diff --git a/command/node_drain.go b/command/node_drain.go
index 978c5daa0..a27ae5251 100644
--- a/command/node_drain.go
+++ b/command/node_drain.go
@@ -271,16 +271,20 @@ func (c *NodeDrainCommand) Run(args []string) int {
 		return 1
 	}
 
-	if enable {
-		c.Ui.Output(fmt.Sprintf("Node %q drain strategy set", node.ID))
-	} else {
-		c.Ui.Output(fmt.Sprintf("Node %q drain strategy unset", node.ID))
+	if !enable || detach {
+		if enable {
+			c.Ui.Output(fmt.Sprintf("Node %q drain strategy set", node.ID))
+		} else {
+			c.Ui.Output(fmt.Sprintf("Node %q drain strategy unset", node.ID))
+		}
 	}
 
 	if enable && !detach {
+		c.Ui.Output("(Ctrl-C to stop monitoring: will not cancel the node drain)")
+		c.Ui.Output(fmt.Sprintf("%s Node %q drain strategy set", formatTime(time.Now()), node.ID))
 		outCh := client.Nodes().MonitorDrain(context.Background(), node.ID, meta.LastIndex, ignoreSystem)
 		for msg := range outCh {
-			c.Ui.Output(msg)
+			c.Ui.Output(fmt.Sprintf("%s %s", formatTime(time.Now()), msg))
 		}
 	}
 
diff --git a/command/node_eligibility.go b/command/node_eligibility.go
index a3fe5f802..64a5d9533 100644
--- a/command/node_eligibility.go
+++ b/command/node_eligibility.go
@@ -150,6 +150,10 @@ func (c *NodeEligibilityCommand) Run(args []string) int {
 		return 1
 	}
 
-	c.Ui.Output(fmt.Sprintf("Node %q scheduling eligibility set", node.ID))
+	if enable {
+		c.Ui.Output(fmt.Sprintf("Node %q scheduling eligibility set: eligible for scheduling", node.ID))
+	} else {
+		c.Ui.Output(fmt.Sprintf("Node %q scheduling eligibility set: ineligible for scheduling", node.ID))
+	}
 	return 0
 }