diff --git a/scripts/install b/scripts/install
index 7193cec..9f5b92d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -70,6 +70,14 @@ ynh_script_progression --message="Installing dependencies..."
 
 ynh_install_nodejs --nodejs_version=$nodejs_version
 
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Configuring system user..." --weight=1
+
+# Create a system user
+ynh_system_user_create --username=$app --home_dir=$final_path
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -87,14 +95,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=1
 # Create a dedicated nginx config
 ynh_add_nginx_config
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..." --weight=1
-
-# Create a system user
-ynh_system_user_create --username=$app --home_dir=$final_path
-
 #=================================================
 # SPECIFIC SETUP
 #=================================================
@@ -102,7 +102,6 @@ ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2
 
 pushd $final_path
 	ynh_use_nodejs
-	#ynh_npm install -g tiddlywiki
 	npm install -g tiddlywiki
 	tiddlywiki mynewwiki --init server
  popd
diff --git a/scripts/upgrade b/scripts/upgrade
index 486b47c..59a9b41 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -69,6 +69,14 @@ ynh_print_info --message="Stopping a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action=stop
 
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_print_info --message="Making sure dedicated system user exists..." --weight=1
+
+# Create a dedicated user (if not existing)
+ynh_system_user_create --username=$app --home_dir=$final_path
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -81,6 +89,7 @@ then
 	#ynh_setup_source --dest_dir="$final_path"
 	
 	pushd $final_path
+		ynh_use_nodejs
 		npm update -g tiddlywiki
 	popd
 fi
@@ -100,14 +109,6 @@ ynh_print_info --message="Upgrading dependencies..." --weight=1
 
 ynh_install_nodejs --nodejs_version=$nodejs_version
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_print_info --message="Making sure dedicated system user exists..." --weight=1
-
-# Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir=$final_path
-
 #=================================================
 # SETUP SYSTEMD
 #=================================================