diff --git a/check_process b/check_process
index 4fe9fe2..8e1aba9 100644
--- a/check_process
+++ b/check_process
@@ -2,8 +2,8 @@
 	; Manifest
 		domain="domain.tld"
 		path="/path"
-		admin="john"
 		is_public=1
+		admin="john"
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@@ -12,7 +12,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1		from_commit=f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6
+		upgrade=1	from_commit=f356f5b8f496f626aba3ec0f9d9c40c4cb54e7f6
 		backup_restore=1
 		multi_instance=1
 		port_already_use=0
diff --git a/conf/nginx.conf b/conf/nginx.conf
index f1d5c49..b26a6dc 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -4,11 +4,6 @@ location __PATH__/ {
   # Path to source
   alias __FINALPATH__/ ;
 
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   index index.php;
 
   # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
diff --git a/manifest.json b/manifest.json
index 4d9e680..fa1f015 100644
--- a/manifest.json
+++ b/manifest.json
@@ -7,7 +7,6 @@
         "fr": "Moteur de blog"
     },
     "version": "2.22~ynh1",
-    "license": "GPL-2.0-or-later",
     "url": "https://dotclear.org/",
     "upstream": {
         "license": "GPL-2.0-or-later",
@@ -16,6 +15,7 @@
         "admindoc": "https://dotclear.org/documentation/2.0",
         "code": "https://git.dotclear.org/dev/dotclear"
     },
+    "license": "GPL-2.0-or-later",
     "maintainer": {
         "name": "kay0u",
         "email": "pierre@kayou.io"
@@ -33,8 +33,7 @@
         "install": [
             {
                 "name": "domain",
-                "type": "domain",
-                "example": "example.com"
+                "type": "domain"
             },
             {
                 "name": "path",
@@ -42,15 +41,14 @@
                 "example": "/dotclear2",
                 "default": "/dotclear2"
             },
-            {
-                "name": "admin",
-                "type": "user",
-                "example": "johndoe"
-            },
             {
                 "name": "is_public",
                 "type": "boolean",
                 "default": true
+            },
+            {
+                "name": "admin",
+                "type": "user"
             }
         ]
     }
diff --git a/scripts/install b/scripts/install
index 59f7b7d..cb124d7 100755
--- a/scripts/install
+++ b/scripts/install
@@ -53,7 +53,7 @@ ynh_app_setting_set --app=$app --key=admin --value=$admin
 ynh_script_progression --message="Configuring system user..." --weight=2
 
 # 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
@@ -64,7 +64,6 @@ db_name=$(ynh_sanitize_dbid --db_name=$app)
 db_user=$db_name
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
-
 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 
 #=================================================
@@ -107,6 +106,8 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config
 
+#=================================================
+# SPECIFIC SETUP
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
@@ -171,6 +172,7 @@ chown $app:$app "$php_config"
 #=================================================
 # SETUP APPLICATION WITH CURL
 #=================================================
+ynh_script_progression --message="Setuping application with CURL..."
 
 # Set the app as temporarily public for curl call
 ynh_script_progression --message="Configuring SSOwat..."
diff --git a/scripts/remove b/scripts/remove
index b0ef127..f2a4bf0 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -58,7 +58,7 @@ ynh_remove_fpm_config
 #=================================================
 # REMOVE FAIL2BAN CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing Fail2ban configuration..."
+ynh_script_progression --message="Removing Fail2Ban configuration..."
 
 # Remove the dedicated Fail2Ban config
 ynh_remove_fail2ban_config
diff --git a/scripts/restore b/scripts/restore
index aa9e6a2..619a437 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -36,8 +36,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..."
 
-ynh_webpath_available --domain=$domain --path_url=$path_url \
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
 test ! -d $final_path \
 	|| ynh_die --message="There is already a directory: $final_path "
 
@@ -56,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..." --weight=2
 
 # 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