diff --git a/docs/cli/cozy-stack_serve.md b/docs/cli/cozy-stack_serve.md
index 748489d21e4..e39f7c337d8 100644
--- a/docs/cli/cozy-stack_serve.md
+++ b/docs/cli/cozy-stack_serve.md
@@ -60,13 +60,15 @@ example), you can use the --appdir flag like this:
       --log-level string                           define the log level (default "info")
       --log-syslog                                 use the local syslog for logging
       --mail-alert-address string                  mail address used for alerts (instance deletion failure for example)
-      --mail-disable-tls                           disable smtp over tls
+      --mail-disable-tls                           disable starttls on smtp
       --mail-host string                           mail smtp host (default "localhost")
+      --mail-local-name string                     hostname sent to the smtp server with the HELO command (default "localhost")
       --mail-noreply-address string                mail address used for sending mail as a noreply (forgot passwords for example)
       --mail-noreply-name string                   mail name used for sending mail as a noreply (forgot passwords for example)
       --mail-password string                       mail smtp password
       --mail-port int                              mail smtp port (default 465)
       --mail-reply-to string                       mail address used to the reply-to (support for example)
+      --mail-use-ssl                               use ssl for mail sending (smtps)
       --mail-username string                       mail smtp username
       --mailhog                                    Alias of --mail-disable-tls --mail-port 1025, useful for MailHog
       --move-url string                            URL for the move wizard (default "https://move.cozycloud.cc/")
diff --git a/scripts/completion/cozy-stack.bash b/scripts/completion/cozy-stack.bash
index 4102fdefe55..7e8a03df2cf 100644
--- a/scripts/completion/cozy-stack.bash
+++ b/scripts/completion/cozy-stack.bash
@@ -49,7 +49,7 @@ __cozy-stack_handle_go_custom_completion()
     local out requestComp lastParam lastChar comp directive args
 
     # Prepare the command to request completions for the program.
-    # Calling ${words[0]} instead of directly cozy-stack allows to handle aliases
+    # Calling ${words[0]} instead of directly cozy-stack allows handling aliases
     args=("${words[@]:1}")
     # Disable ActiveHelp which is not supported for bash completion v1
     requestComp="COZY_STACK_ACTIVE_HELP=0 ${words[0]} __completeNoDesc ${args[*]}"
@@ -3888,6 +3888,8 @@ _cozy-stack_serve()
     flags+=("--mail-disable-tls")
     flags+=("--mail-host=")
     two_word_flags+=("--mail-host")
+    flags+=("--mail-local-name=")
+    two_word_flags+=("--mail-local-name")
     flags+=("--mail-noreply-address=")
     two_word_flags+=("--mail-noreply-address")
     flags+=("--mail-noreply-name=")
@@ -3898,6 +3900,7 @@ _cozy-stack_serve()
     two_word_flags+=("--mail-port")
     flags+=("--mail-reply-to=")
     two_word_flags+=("--mail-reply-to")
+    flags+=("--mail-use-ssl")
     flags+=("--mail-username=")
     two_word_flags+=("--mail-username")
     flags+=("--mailhog")
diff --git a/scripts/completion/cozy-stack.fish b/scripts/completion/cozy-stack.fish
index 0a4adc5913f..f9ff04f8c95 100644
--- a/scripts/completion/cozy-stack.fish
+++ b/scripts/completion/cozy-stack.fish
@@ -79,7 +79,7 @@ function __cozy_stack_clear_perform_completion_once_result
     __cozy_stack_debug ""
     __cozy_stack_debug "========= clearing previously set __cozy_stack_perform_completion_once_result variable =========="
     set --erase __cozy_stack_perform_completion_once_result
-    __cozy_stack_debug "Succesfully erased the variable __cozy_stack_perform_completion_once_result"
+    __cozy_stack_debug "Successfully erased the variable __cozy_stack_perform_completion_once_result"
 end
 
 function __cozy_stack_requires_order_preservation