diff --git a/scripts/install b/scripts/install
index d3b1eaf..b9ea100 100644
--- a/scripts/install
+++ b/scripts/install
@@ -27,7 +27,7 @@ domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
 admin=$YNH_APP_ARG_ADMIN
-email=$(ynh_user_get_info --username=$admin --key=mail)
+email=$(ynh_user_get_info --username="$admin" --key=mail)
 password=$YNH_APP_ARG_PASSWORD
 language=$YNH_APP_ARG_LANGUAGE
 team_display_name=$YNH_APP_ARG_TEAM_DISPLAY_NAME
@@ -54,11 +54,11 @@ ynh_script_progression --message="Storing installation settings..." --weight=6
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
-ynh_app_setting_set --app=$app --key=admin --value=$admin
-ynh_app_setting_set --app=$app --key=password --value=$password
+ynh_app_setting_set --app=$app --key=admin --value="$admin"
+ynh_app_setting_set --app=$app --key=password --value="$password"
 ynh_app_setting_set --app=$app --key=language --value=$language
 ynh_app_setting_set --app=$app --key=version --value=$version
-ynh_app_setting_set --app=$app --key=team_display_name --value=$team_display_name
+ynh_app_setting_set --app=$app --key=team_display_name --value="$team_display_name"
 
 #=================================================
 # FIND AN AVAILABLE PORT