diff --git a/roles/ynh_config/README-FR.md b/roles/ynh_config/README-FR.md
index e23b0724c3de0d016eb9942df427ccf81d878677..cbdd402baddfe78dbf69253ccd1c270b7a2cc025 100644
--- a/roles/ynh_config/README-FR.md
+++ b/roles/ynh_config/README-FR.md
@@ -15,7 +15,6 @@ Les variables par défaut sont disponibles dans `default/main.yml` cependant il
 ### Configuration d'un relais SMTP
 
 ```yml
-# paramètres personnalisés du relais SMTP
 ynh_smtp_relay:
     host: smtp.domain.tld
     port: 25
@@ -24,7 +23,7 @@ ynh_smtp_relay:
 ```
 
 Yunohost possède son propre serveur SMTP natif mais il est aussi possible de configurer Yunohost pour qu'il utilise un relais SMTP à la place.
-Pour faire cela, créez la variable `ynh_smtp_relay` et mettez vos propres valeurs. Vous pouvez en apprendre plus sur les relais SMTP [ici](https://yunohost.org/fr/administrate/specific_use_cases/email_relay).
+Pour faire cela, créez la variable `ynh_smtp_relay` pour y mettre vos propres valeurs. Vous pouvez en apprendre plus sur les relais SMTP [ici](https://yunohost.org/fr/administrate/specific_use_cases/email_relay).
 
 ### Configuration des mises à jour
 
diff --git a/roles/ynh_config/README.md b/roles/ynh_config/README.md
index e072a1c5f38436a893a9efc20335901f62fce53d..82c73edfd61f4f5ab6e5f49b259a25e9b55b3fa7 100644
--- a/roles/ynh_config/README.md
+++ b/roles/ynh_config/README.md
@@ -15,7 +15,6 @@ Default variables are available in `default/main.yml` however it is necessary to
 ### SMTP relay configuration
 
 ```yml
-# SMTP custom settings
 ynh_smtp_relay:
     host: smtp.domain.tld
     port: 25
@@ -24,7 +23,7 @@ ynh_smtp_relay:
 ```
 
 There is a built-in SMTP server on Yunohost but you can also set up Yunohost to use a SMTP relay instead.
-In order to do so, create the `ynh_smtp_relay` variable and provide your own values. You can learn more about SMTP relay [here](https://yunohost.org/en/administrate/specific_use_cases/email_relay).
+In order to do so, create the `ynh_smtp_relay` variable in order to provide your own values. You can learn more about SMTP relay [here](https://yunohost.org/en/administrate/specific_use_cases/email_relay).
 
 ### Updates configuration
 
diff --git a/roles/ynh_config/tasks/main.yml b/roles/ynh_config/tasks/main.yml
index 7f5af9343b1cd265793f4b315f4a17db934668ab..bbb1badc60e3526fe074cd8a6cf15e43fb8ccc73 100644
--- a/roles/ynh_config/tasks/main.yml
+++ b/roles/ynh_config/tasks/main.yml
@@ -18,6 +18,14 @@
 #                                                                             #
 #-----------------------------------------------------------------------------#
 
+- name: Ensure SMTP relay is enabled
+  ansible.builtin.command:
+    "yunohost settings set email.smtp.smtp_relay_enabled -v yes"
+  when: ynh_smtp_relay
+  tags:
+    - yunohost
+    - smtp
+
 - name: Configure SMTP relay
   ansible.builtin.include_tasks: smtp_relay.yml
   loop: "{{ ynh_smtp_relay | dict2items }}"
diff --git a/roles/ynh_config/tasks/smtp_relay.yml b/roles/ynh_config/tasks/smtp_relay.yml
index 02de04358672e6840b2bbeb52700149191885069..a3f68b321da6bec571890c540128202e57cd0d94 100644
--- a/roles/ynh_config/tasks/smtp_relay.yml
+++ b/roles/ynh_config/tasks/smtp_relay.yml
@@ -22,7 +22,7 @@
   ansible.builtin.command:
     "yunohost settings get smtp.relay.{{ item.key }}"
   register: _ynh_smtp_current_values
-  changed_when: False
+  changed_when: false
   tags:
     - yunohost
     - smtp