diff --git a/manifest.json b/manifest.json
index 6490b3e..02465cf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -61,8 +61,8 @@
                     "en": "Choose the application language",
                     "fr": "Choisissez la langue de l'application"
                 },
-                "choices": ["fr_FR", "en_US"],
-                "default": "fr_FR"
+                "choices": ["fr", "en"],
+                "default": "fr"
             },
         ]
     }
diff --git a/scripts/install b/scripts/install
index 3a0e906..83017a7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -53,7 +53,6 @@ ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=admin --value=$admin
 ynh_app_setting_set --app=$app --key=random --value=$random
 ynh_app_setting_set --app=$app --key=password --value="$password"
-ynh_app_setting_set --app=$app --key=language --value=$language
 
 #=================================================
 # INSTALL DEPENDENCIES
@@ -89,7 +88,14 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$final_path"
 
-ynh_setup_source --dest_dir="$final_path/user/languages" --source_id="fr"
+if [ "$language" == "fr" ]; then
+	language="fr-FR"
+	ynh_setup_source --dest_dir="$final_path/user/languages" --source_id="fr"
+	ynh_app_setting_set --app=$app --key=language --value=$language
+else
+	language=""
+	ynh_app_setting_set --app=$app --key=language --value=$language
+fi
 
 # copy index file 
 cp ../conf/index.php $final_path/