diff --git a/scripts/upgrade b/scripts/upgrade
index a9990c6..dba17c8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -60,6 +60,9 @@ if [ -z "$admin" ] || [ -z "$hashedpassword" ]; then
 	pass_set="false"
 	ynh_app_setting_set --app=$app --key=admin --value=$admin
 	ynh_app_setting_set --app=$hashedpassword --key=hashedpassword --value=$hashedpassword
+
+        # Setup user credentials file
+        echo "{\"$admin\":{\"name\":\"$admin\",\"pass_set\":$pass_set,\"hash\":\"$hashedpassword\"}}" > "$final_path/src/etc/passwd"
 else
 	pass_set="true"
 fi
@@ -159,9 +162,6 @@ echo "ZT_TOKEN=$(</var/lib/zerotier-one/authtoken.secret)" >> $env_file
 echo "ZT_ADDR=localhost:$(</var/lib/zerotier-one/zerotier-one.port)" >> $env_file
 echo "HTTP_PORT=$port" >> $env_file
 
-# Setup user credentials file
-echo "{\"$admin\":{\"name\":\"$admin\",\"pass_set\":$pass_set,\"hash\":\"$hashedpassword\"}}" >> "$final_path/src/etc/passwd"
-
 #=================================================
 # LINK CERTIFICATES
 #=================================================