diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh
index b4675c57f..beee5b8d4 100755
--- a/scripts/dev/server.sh
+++ b/scripts/dev/server.sh
@@ -2,8 +2,8 @@
 
 set -eu
 
-if [ ! -f "./client/dist/en_US/index.html" ]; then
-  echo "client/dist/en_US/index.html does not exist, compile client files..."
+if [ ! -f "./client/dist/en-US/index.html" ]; then
+  echo "client/dist/en-US/index.html does not exist, compile client files..."
   npm run build:client -- --light
 fi
 
diff --git a/server/lib/emailer.ts b/server/lib/emailer.ts
index bd3d4f252..523b11d0d 100644
--- a/server/lib/emailer.ts
+++ b/server/lib/emailer.ts
@@ -441,7 +441,7 @@ class Emailer {
     return JobQueue.Instance.createJob({ type: 'email', payload: emailPayload })
   }
 
-  sendMail (options: EmailPayload) {
+  async sendMail (options: EmailPayload) {
     if (!Emailer.isEnabled()) {
       throw new Error('Cannot send mail because SMTP is not configured.')
     }
@@ -450,13 +450,15 @@ class Emailer {
       ? options.fromDisplayName
       : WEBSERVER.HOST
 
-    return this.transporter.sendMail({
-      from: `"${fromDisplayName}" <${CONFIG.SMTP.FROM_ADDRESS}>`,
-      replyTo: options.replyTo,
-      to: options.to.join(','),
-      subject: options.subject,
-      text: options.text
-    })
+    for (const to of options.to) {
+      await this.transporter.sendMail({
+        from: `"${fromDisplayName}" <${CONFIG.SMTP.FROM_ADDRESS}>`,
+        replyTo: options.replyTo,
+        to,
+        subject: options.subject,
+        text: options.text
+      })
+    }
   }
 
   private dieOnConnectionFailure (err?: Error) {