diff --git a/conf/default.env b/conf/default.env
index c2115e9..e03cada 100644
--- a/conf/default.env
+++ b/conf/default.env
@@ -26,7 +26,7 @@ MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS='__EMAIL__'
-MAIL_FROM_NAME="__EMAIL_FIRSTNAME__ __EMAIL_LASTNAME__"
+MAIL_FROM_NAME='__EMAIL_FULLNAME__'
 
 DEMO_MODE=false
 
diff --git a/scripts/install b/scripts/install
index 598c9e8..b4b55ae 100755
--- a/scripts/install
+++ b/scripts/install
@@ -16,8 +16,7 @@ source /usr/share/yunohost/helpers
 api_secret="$(ynh_string_random --length=32)"
 app_key="$(ynh_string_random --length=32)"
 phantomjs_key="$(ynh_string_random --length=32)"
-email_firstname="$(ynh_user_get_info --username=$admin --key=firstname)"
-email_lastname="$(ynh_user_get_info --username=$admin --key=lastname)"
+email_fullname="$(ynh_user_get_info --username=$admin --key=fullname)"
 email="$(ynh_user_get_info --username=$admin --key=mail)"
 
 #=================================================
@@ -28,8 +27,7 @@ ynh_script_progression --message="Storing installation settings..."
 ynh_app_setting_set --app=$app --key=api_secret --value=$api_secret
 ynh_app_setting_set --app=$app --key=app_key --value=$app_key
 ynh_app_setting_set --app=$app --key=phantomjs_key --value=$phantomjs_key
-ynh_app_setting_set --app=$app --key=email_firstname --value="$email_firstname"
-ynh_app_setting_set --app=$app --key=email_lastname --value="$email_lastname"
+ynh_app_setting_set --app=$app --key=email_fullname --value="$email_fullname"
 ynh_app_setting_set --app=$app --key=email --value=$email
 
 #=================================================