diff --git a/scripts/install b/scripts/install
index 444ea45..c45ea91 100644
--- a/scripts/install
+++ b/scripts/install
@@ -146,7 +146,7 @@ ynh_add_nginx_config
 #=================================================
 
 # Create a system user
-ynh_system_user_create $app
+ynh_system_user_create "$app" "$final_path"
 
 #=================================================
 # PHP-FPM CONFIGURATION
@@ -172,7 +172,7 @@ ynh_system_user_create $app
 # ...
 #=================================================
 
-chown -R $app: $final_path
+chown -R "$app":"$app" "$final_path"
 
 pushd $final_path
 ynh_use_nodejs
@@ -270,7 +270,7 @@ ynh_store_file_checksum "$final_path/config.yml"
 ### 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 2216b13..b6fb475 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -69,14 +69,14 @@ ynh_psql_execute_file_as_root ./db.sql "$db_name"
 #=================================================
 
 # 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 $app: $final_path
+chown -R "$app":"$app" "$final_path"
 
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index cd3c8ab..d304d57 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -98,7 +98,7 @@ ynh_install_nodejs 10
 #=================================================
 
 # Create a dedicated user (if not existing)
-ynh_system_user_create $app
+ynh_system_user_create "$app" "$final_path"
 
 #=================================================
 # PHP-FPM CONFIGURATION
@@ -113,7 +113,7 @@ ynh_system_user_create $app
 # ...
 #=================================================
 
-chown -R $app: $final_path
+chown -R "$app":"$app" "$final_path"
 
 pushd $final_path
 ynh_use_nodejs
@@ -154,7 +154,7 @@ ynh_add_systemd_config
 #=================================================
 
 # Set permissions on app files
-chown -R $app: $final_path
+chown -R "$app":"$app" "$final_path"
 
 #=================================================
 # SETUP SSOWAT