diff --git a/check_process b/check_process
index 9c3917f..823d278 100644
--- a/check_process
+++ b/check_process
@@ -2,8 +2,8 @@
 	; Manifest
 		domain="domain.tld"
 		path="/path"
-		admin="john"
 		is_public=1
+		admin="john"
 		password="1Strong-Password"
 	; Checks
 		pkg_linter=1
@@ -23,5 +23,4 @@
 		change_url=1
 ;;; Options
 Email=anmol@datamol.org
-Notification=
 Notification=none
diff --git a/manifest.json b/manifest.json
index b6b0be7..63e43bc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -36,18 +36,18 @@
             {
                 "name": "path",
                 "type": "path",
-                "example": "/example",
+                "example": "/joomla",
                 "default": "/joomla"
             },
-            {
-                "name": "admin",
-                "type": "user"
-            },
             {
                 "name": "is_public",
                 "type": "boolean",
                 "default": true
             },
+            {
+                "name": "admin",
+                "type": "user"
+            },
             {
                 "name": "password",
                 "type": "password",
diff --git a/scripts/backup b/scripts/backup
index 4cf0ae1..5f502ba 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -14,9 +14,6 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================
 
-ynh_clean_setup () {
-	true
-}
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
diff --git a/scripts/install b/scripts/install
index aaf7f3a..7738ec3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -22,13 +22,14 @@ ynh_abort_if_errors
 
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
-admin=$YNH_APP_ARG_ADMIN
-admin_email=$(ynh_user_get_info $admin 'mail')
 is_public=$YNH_APP_ARG_IS_PUBLIC
+admin=$YNH_APP_ARG_ADMIN
 password=$YNH_APP_ARG_PASSWORD
 
 app=$YNH_APP_INSTANCE_NAME
 
+admin_email=$(ynh_user_get_info --username="$admin" --key="mail")
+
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
@@ -64,7 +65,7 @@ ynh_install_app_dependencies $pkg_dependencies
 ynh_script_progression --message="Configuring system user..."
 
 # Create a system user
-ynh_system_user_create --username=$app --home_dir=$final_path
+ynh_system_user_create --username=$app --home_dir="$final_path"
 
 #=================================================
 # CREATE A MYSQL DATABASE
diff --git a/scripts/restore b/scripts/restore
index 112b5be..9b8b4d5 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -14,9 +14,6 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================
 
-ynh_clean_setup () {
-	true
-}
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
@@ -57,7 +54,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 ynh_script_progression --message="Recreating the dedicated system user..."
 
 # Create the dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir=$final_path
+ynh_system_user_create --username=$app --home_dir="$final_path"
 
 #=================================================
 # RESTORE THE APP MAIN DIR
diff --git a/scripts/upgrade b/scripts/upgrade
index c9fb8b9..76ee55f 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -58,7 +58,7 @@ ynh_script_progression --message="Ensuring downward compatibility..."
 ynh_script_progression --message="Making sure dedicated system user exists..."
 
 # Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir=$final_path
+ynh_system_user_create --username=$app --home_dir="$final_path"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -101,10 +101,6 @@ ynh_add_fpm_config
 
 #=================================================
 # SPECIFIC UPGRADE
-#=================================================
-# ...
-#=================================================
-
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================