diff --git a/scripts/install b/scripts/install
index 32e3e24..e1c89ad 100644
--- a/scripts/install
+++ b/scripts/install
@@ -17,8 +17,8 @@ ynh_app_setting_set --app=$app --key=smtp_port --value=25
 ynh_app_setting_set --app=$app --key=smtp_user --value=$app
 ynh_app_setting_set --app=$app --key=smtp_password --value=$mail_pwd
 ynh_app_setting_set --app=$app --key=smtp_security --value=STARTTLS
-ynh_app_setting_set --app=$app --key=mail_return_path --value=$app@$domain
-ynh_app_setting_set --app=$app --key=mail_sender --value=$app@$domain
+ynh_app_setting_set --app=$app --key=smtp_mail_return_path --value=$app@$domain
+ynh_app_setting_set --app=$app --key=smtp_mail_sender --value=$app@$domain
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
diff --git a/scripts/upgrade b/scripts/upgrade
index c40a6c3..677f190 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -55,8 +55,8 @@ if [ -z "${smtp_host:-}" ]; then
 		ynh_app_setting_set --app=$app --key=smtp_user --value=$smtp_user
 		ynh_app_setting_set --app=$app --key=smtp_password --value=$smtp_password
 		ynh_app_setting_set --app=$app --key=smtp_security --value=$smtp_security
-		ynh_app_setting_set --app=$app --key=mail_return_path --value=$mail_return_path
-		ynh_app_setting_set --app=$app --key=mail_sender --value=$mail_sender
+		ynh_app_setting_set --app=$app --key=smtp_mail_return_path --value=$mail_return_path
+		ynh_app_setting_set --app=$app --key=smtp_mail_sender --value=$mail_sender
 fi
 
 #=================================================