diff --git a/lang/admin/en-us.json b/lang/admin/en-us.json
index 4082881..7051a21 100644
--- a/lang/admin/en-us.json
+++ b/lang/admin/en-us.json
@@ -46,7 +46,7 @@
         "unknown": "Unknown",
         "label": "Label",
         "announce": "Announce",
-        "subject": "Email Subject",
+        "subject": "Subject",
         "message": "Message",
         "variables": "Variables",
         "conditionals": "Conditionals",
@@ -56,12 +56,12 @@
         "donate": "Donate",
         "extendExpiry": "Extend expiry",
         "customizeEmails": "Customize Emails",
-        "customizeEmailsDescription": "If you don't want to use jfa-go's email templates, you can create your own using Markdown.",
+        "customizeEmailsDescription": "If you don't want to use jfa-go's message templates, you can create your own using Markdown.",
         "markdownSupported": "Markdown is supported.",
         "modifySettings": "Modify Settings",
         "modifySettingsDescription": "Apply settings from an existing profile, or source them directly from a user.",
         "applyHomescreenLayout": "Apply homescreen layout",
-        "sendDeleteNotificationEmail": "Send notification email",
+        "sendDeleteNotificationEmail": "Send notification message",
         "sendDeleteNotifiationExample": "Your account has been deleted.",
         "settingsRestart": "Restart",
         "settingsRestarting": "Restarting…",
@@ -128,7 +128,7 @@
         "errorFailureCheckLogs": "Failed (check console/logs)",
         "errorPartialFailureCheckLogs": "Partial failure (check console/logs)",
         "errorUserCreated": "Failed to create user {n}.",
-        "errorSendWelcomeEmail": "Failed to send welcome email (check console/logs)",
+        "errorSendWelcomeEmail": "Failed to send welcome message (check console/logs)",
         "errorApplyUpdate": "Failed to apply update, try manually.",
         "errorCheckUpdate": "Failed to check for update.",
         "updateAvailable": "A new update is available, check settings.",
diff --git a/lang/admin/fr-fr.json b/lang/admin/fr-fr.json
index f3af46b..a036bda 100644
--- a/lang/admin/fr-fr.json
+++ b/lang/admin/fr-fr.json
@@ -68,7 +68,7 @@
         "settingsRestarting": "Redémarrage…",
         "settingsRestart": "Redémarrer",
         "announce": "Annoncer",
-        "subject": "Sujet du courriel",
+        "subject": "Sujet",
         "message": "Message",
         "markdownSupported": "Markdown est pris en charge.",
         "customizeEmailsDescription": "Si vous ne souhaitez pas utiliser les modèles d'e-mails de jfa-go, vous pouvez créer les vôtres à l'aide de Markdown.",
diff --git a/telegram.go b/telegram.go
index 9e9fcb3..cfb92fb 100644
--- a/telegram.go
+++ b/telegram.go
@@ -174,6 +174,7 @@ func (t *TelegramDaemon) run() {
 			}
 
 		case <-t.ShutdownChannel:
+			t.bot.StopReceivingUpdates()
 			t.ShutdownChannel <- "Down"
 			return
 		}