diff --git a/scripts/install b/scripts/install
index 651120e..bca64e6 100755
--- a/scripts/install
+++ b/scripts/install
@@ -173,7 +173,7 @@ ynh_add_nginx_config
 #=================================================
 
 # Create a system user
-ynh_system_user_create $app
+ynh_system_user_create "$app" "$final_path"
 
 #=================================================
 # PHP-FPM CONFIGURATION
@@ -305,7 +305,7 @@ ynh_store_file_checksum "$final_path/config.ini"
 ### that really need such authorization.
 
 # Set permissions to app files
-chown -R $app: $final_path
+chown -R "$app":"$app" "$final_path"
 
 #=================================================
 # SETUP LOGROTATE
diff --git a/scripts/restore b/scripts/restore
index f4cb4f9..a427469 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -67,14 +67,14 @@ ynh_mysql_connect_as $db_name $db_pwd $db_name < ./db.sql
 #=================================================
 
 # Create the dedicated user (if not existing)
-ynh_system_user_create $app
+ynh_system_user_create "$app" "$final_path"
 
 #=================================================
 # RESTORE USER RIGHTS
 #=================================================
 
 # Restore permissions on app files
-chown -R root: $final_path
+chown -R "$app":"$app" "$final_path"
 
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 417d0fb..ebdca4f 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -99,7 +99,7 @@ ynh_add_nginx_config
 #=================================================
 
 # Create a dedicated user (if not existing)
-ynh_system_user_create $app
+ynh_system_user_create "$app" "$final_path"
 
 #=================================================
 # PHP-FPM CONFIGURATION
@@ -155,7 +155,7 @@ ynh_add_systemd_config
 #=================================================
 
 # Set permissions on app files
-chown -R $app: $final_path
+chown -R "$app":"$app" "$final_path"
 
 #=================================================
 # SETUP SSOWAT