diff --git a/scripts/install b/scripts/install
index e698904..01f6da7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -59,6 +59,14 @@ ynh_script_progression --message="Finding an available port..."
 port=$(ynh_find_port --port=8095)
 ynh_app_setting_set --app=$app --key=port --value=$port
 
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Configuring system user..."
+
+# Create a system user
+ynh_system_user_create --username=$app
+
 #=================================================
 # ADD ONLYOFFICE REPOSITORY
 #=================================================
@@ -99,14 +107,6 @@ fi
 # Create a dedicated NGINX config
 ynh_add_nginx_config "nextclouddomain"
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..."
-
-# Create a system user
-ynh_system_user_create --username=$app
-
 #=================================================
 # SPECIFIC SETUP
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 58819b0..bb57f83 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -87,7 +87,7 @@ ynh_script_progression --message="Removing file..."
 # Remove a directory securely
 ynh_secure_remove --file="/etc/onlyoffice"
 ynh_secure_remove --file="/var/lib/onlyoffice"
-ynh_secure_remove --file="/var/cache/nginx/onlyoffice"
+#ynh_secure_remove --file="/var/cache/nginx/onlyoffice"
 
 # Remove the log files
 ynh_secure_remove --file="/var/log/$app"
@@ -100,7 +100,7 @@ ynh_secure_remove --file="/var/log/$app"
 ynh_script_progression --message="Removing the dedicated system user..."
 
 # Delete a system user
-gpasswd -d www-data onlyoffice
+#gpasswd -d www-data onlyoffice
 ynh_system_user_delete --username=$app
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index c16be72..3f12d43 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -65,6 +65,14 @@ ynh_clean_setup () {
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Making sure dedicated system user exists..."
+
+# Create a dedicated user (if not existing)
+ynh_system_user_create --username=$app
+
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -88,14 +96,6 @@ ynh_script_progression --message="Upgrading dependencies..."
 
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..."
-
-# Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app
-
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================