diff --git a/scripts/install b/scripts/install
index bc886f6..c2f7881 100755
--- a/scripts/install
+++ b/scripts/install
@@ -45,7 +45,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir/build"
 ynh_setup_source --dest_dir="$install_dir/build_ldap" --source_id="ldap"
-ynh_setup_source --dest_dir="$install_dir/build" --source_id="generator"
+ynh_setup_source --dest_dir="$install_dir" --source_id="generator"
 
 mkdir -p "$install_dir/live/data"
 mkdir -p "$install_dir/live_ldap/data"
@@ -54,7 +54,7 @@ ynh_replace_string --match_string="<div class=\"galene-header\">Galène</div>" -
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
-chmod +x "$install_dir/build/galene-password-generator"
+chmod +x "$install_dir/galene-password-generator"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -102,7 +102,7 @@ chown -R $app:www-data "$data_dir"
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-pushd $install_dir/build/
+pushd $install_dir
 	password_hash=$(echo ./galene-password-generator $password)
 popd