diff --git a/check_process b/check_process
index de67898c..def01e36 100644
--- a/check_process
+++ b/check_process
@@ -5,8 +5,8 @@
         admin="john"
         email="john@gmail.com"
         admin_email="john@gmail.com"
-        password="admin!42"
-        admin_password="admin!42"
+        password="admin!(&42"
+        admin_password="admin!(&42"
         language="fr"
         version="Enterprise"
         team_display_name="Mon équipe"
@@ -31,8 +31,8 @@
         admin="john"
         email="john@gmail.com"
         admin_email="john@gmail.com"
-        password="admin!42"
-        admin_password="admin!42"
+        password="admin!(&42"
+        admin_password="admin!(&42"
         language="fr"
         version="Team"
         team_display_name="Mon équipe"
@@ -50,4 +50,4 @@ Notification=none
 ;;; Upgrade options
     ; commit=4fa3ee4ad82a6154f2eb858a3da285a35afecef8
         name= Merge pull request #268 from YunoHost-Apps/testing 
-        
\ No newline at end of file
+        
diff --git a/scripts/install b/scripts/install
index 13b51d2f..c35c1fe3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -28,9 +28,9 @@ 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)
-password=$YNH_APP_ARG_PASSWORD
+password="$YNH_APP_ARG_PASSWORD"
 language=$YNH_APP_ARG_LANGUAGE
-team_display_name=$YNH_APP_ARG_TEAM_DISPLAY_NAME
+team_display_name="$YNH_APP_ARG_TEAM_DISPLAY_NAME"
 architecture=$(ynh_detect_arch)
 version=$YNH_APP_ARG_VERSION
 
@@ -55,10 +55,10 @@ 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=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