diff --git a/conf/config-domain.php b/conf/config-domain.php
index 7ea0f92..23b0ebc 100644
--- a/conf/config-domain.php
+++ b/conf/config-domain.php
@@ -21,6 +21,8 @@ $CFG->wwwroot   = 'https://__DOMAIN__';
 $CFG->dataroot  = '__DATA_PATH__';
 $CFG->admin = 'admin';
 
+$CFG->lang = '__LANGUAGE__';
+
 $CFG->directorypermissions = 02777;
 
 require_once(__DIR__ . '/lib/setup.php'); // Do not edit
diff --git a/conf/config-path.php b/conf/config-path.php
index 768e7d0..832f944 100644
--- a/conf/config-path.php
+++ b/conf/config-path.php
@@ -21,6 +21,8 @@ $CFG->wwwroot   = 'https://__DOMAIN____PATH__';
 $CFG->dataroot  = '__DATA_PATH__';
 $CFG->admin = 'admin';
 
+$CFG->lang = '__LANGUAGE__';
+
 $CFG->directorypermissions = 02777;
 
 require_once(__DIR__ . '/lib/setup.php'); // Do not edit
diff --git a/manifest.json b/manifest.json
index 886521c..e75157e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -58,6 +58,16 @@
                 "name": "is_public",
                 "type": "boolean",
                 "default": true
+            },
+            {
+                "name": "language",
+                "type": "string",
+                "ask": {
+                    "en": "Choose the application language",
+                    "fr": "Choisissez la langue de l'application"
+                },
+                "choices": ["fr", "en"],
+                "default": "fr"
             }
         ]
     }
diff --git a/scripts/upgrade b/scripts/upgrade
index c15d324..56cb4c8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -22,6 +22,7 @@ admin=$(ynh_app_setting_get --app=$app --key=admin)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 data_path=$(ynh_app_setting_get --app=$app --key=data_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+language=$(ynh_app_setting_get --app=$app --key=language)
 site_name=$(ynh_app_setting_get --app=$app --key=site_name)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
@@ -76,6 +77,12 @@ if [ -z "$fpm_usage" ]; then
 	ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
 fi
 
+# If fpm_usage doesn't exist, create it
+if [ -z "$language" ]; then
+	language=en
+	ynh_app_setting_set --app=$app --key=language --value=$language
+fi
+
 # Cleaning legacy permissions
 if ynh_legacy_permissions_exists; then
 	ynh_legacy_permissions_delete_all