diff --git a/data/hooks/conf_regen/19-postfix b/data/hooks/conf_regen/19-postfix
index 172438f37..10076b680 100755
--- a/data/hooks/conf_regen/19-postfix
+++ b/data/hooks/conf_regen/19-postfix
@@ -35,7 +35,7 @@ do_pre_regen() {
     > "${default_dir}/postsrsd"
 
   # adapt it for IPv4-only hosts
-  ipv6="$(yunohost settings get 'smtp.ipv6')"
+  ipv6="$(yunohost settings get 'smtp.allow_ipv6')"
   if [ "$ipv6" == "False" ] || [ ! -f /proc/net/if_inet6 ]; then
     sed -i \
       's/ \[::ffff:127.0.0.0\]\/104 \[::1\]\/128//g' \
diff --git a/locales/en.json b/locales/en.json
index 0fc9ca777..fc4726aed 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -312,6 +312,7 @@
     "global_settings_setting_security_postfix_compatibility": "Compatibility vs. security tradeoff for the Postfix server. Affects the ciphers (and other security-related aspects)",
     "global_settings_unknown_setting_from_settings_file": "Unknown key in settings: '{setting_key:s}', discard it and save it in /etc/yunohost/settings-unknown.json",
     "global_settings_setting_service_ssh_allow_deprecated_dsa_hostkey": "Allow the use of (deprecated) DSA hostkey for the SSH daemon configuration",
+    "global_settings_setting_smtp_allow_ipv6": "Allow the use of IPv6 to receive and send mail",
     "global_settings_unknown_type": "Unexpected situation, the setting {setting:s} appears to have the type {unknown_type:s} but it is not a type supported by the system.",
     "good_practices_about_admin_password": "You are now about to define a new administration password. The password should be at least 8 characters long—though it is good practice to use a longer password (i.e. a passphrase) and/or to use a variation of characters (uppercase, lowercase, digits and special characters).",
     "good_practices_about_user_password": "You are now about to define a new user password. The password should be at least 8 characters long—though it is good practice to use a longer password (i.e. a passphrase) and/or to a variation of characters (uppercase, lowercase, digits and special characters).",
diff --git a/src/yunohost/settings.py b/src/yunohost/settings.py
index c016e0809..db94e7429 100644
--- a/src/yunohost/settings.py
+++ b/src/yunohost/settings.py
@@ -70,7 +70,7 @@ DEFAULTS = OrderedDict([
     ("security.postfix.compatibility", {"type": "enum", "default": "intermediate",
         "choices": ["intermediate", "modern"]}),
     ("pop3.enabled", {"type": "bool", "default": False}),
-    ("smtp.ipv6", {"type": "bool", "default": True}),
+    ("smtp.allow_ipv6", {"type": "bool", "default": True}),
 ])