diff --git a/scripts/restore b/scripts/restore
index 2fa8132..a347460 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -59,7 +59,7 @@ ynh_restore_file "$final_path"
 ynh_script_progression --message="Recreating the dedicated system user..." --time --weight=1
 
 # Create the dedicated user (if not existing)
-ynh_system_user_create "$app" "/home/$app"
+ynh_system_user_create "$app" "$final_path"
 # Allow bash for our user, so he can use hub
 chsh --shell /bin/bash "$app"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 1430346..b0e0e65 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -140,7 +140,7 @@ ynh_install_app_dependencies "$pkg_dependencies"
 ynh_script_progression --message="Making sure dedicated system user exists..." --time --weight=1
 
 # Create a system user
-ynh_system_user_create "$app" "/home/$app"
+ynh_system_user_create "$app" "$final_path"
 chsh --shell /bin/bash "$app"
 
 #=================================================