diff --git a/src/managesieve/main.c b/src/managesieve/main.c
index c5fa3e1b7f37a635bbca20f5f910de6de43bcd9f..4dc1c89d24164ce6036dedef309239c3989a6a59 100644
--- a/src/managesieve/main.c
+++ b/src/managesieve/main.c
@@ -82,8 +82,8 @@ void managesieve_refresh_proctitle(void)
 static void client_kill_idle(struct client *client)
 {
 	mail_storage_service_io_activate_user(client->service_user);
-	client_send_bye(client, "Server shutting down.");
-	client_destroy(client, "Server shutting down.");
+	client_send_bye(client, MASTER_SERVICE_SHUTTING_DOWN_MSG".");
+	client_destroy(client, MASTER_SERVICE_SHUTTING_DOWN_MSG);
 }
 
 static void managesieve_die(void)
diff --git a/src/managesieve/managesieve-client.c b/src/managesieve/managesieve-client.c
index f7fb0ccf4be628111d2430cee2abc7c3a899f276..89e29d2dcddbe61e501497cafa7b1a27216133d3 100644
--- a/src/managesieve/managesieve-client.c
+++ b/src/managesieve/managesieve-client.c
@@ -781,8 +781,8 @@ void client_kick(struct client *client)
 {
 	mail_storage_service_io_activate_user(client->service_user);
 	if (!client->command_pending)
-		client_send_bye(client, "Server shutting down.");
-	client_destroy(client, "Server shutting down.");
+		client_send_bye(client, MASTER_SERVICE_SHUTTING_DOWN_MSG".");
+	client_destroy(client, MASTER_SERVICE_SHUTTING_DOWN_MSG);
 }
 
 void clients_destroy_all(void)