diff --git a/resources/js/components/FormSelect.vue b/resources/js/components/FormSelect.vue
new file mode 100644
index 00000000..03de2f52
--- /dev/null
+++ b/resources/js/components/FormSelect.vue
@@ -0,0 +1,54 @@
+<template>
+    <div class="field">
+        <label class="label" v-html="label"></label>
+        <div class="control">
+            <div class="select">
+                <select v-model="form[fieldName]">
+                    <option v-for="option in options" :value="option.value">{{ option.text }}</option>
+                </select>
+            </div>
+        </div>
+        <field-error :form="form" :field="fieldName" />
+        <p class="help" v-html="help" v-if="help"></p>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'FormSelect',
+        
+        data() {
+            return {
+
+            }
+        },
+
+        props: {
+            label: {
+                type: String,
+                default: ''
+            },
+
+            fieldName: {
+                type: String,
+                default: '',
+                required: true
+            },
+
+            options: {
+                type: Array,
+                required: true
+            },
+
+            form: {
+                type: Object,
+                required: true
+            },
+
+            help: {
+                type: String,
+                default: ''
+            },
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/resources/js/components/index.js b/resources/js/components/index.js
index e4191871..b2cd7d31 100644
--- a/resources/js/components/index.js
+++ b/resources/js/components/index.js
@@ -3,6 +3,7 @@ import Button from './Button'
 import FieldError from './FieldError'
 import FormWrapper from './FormWrapper'
 import FormField from './FormField'
+import FormSelect from './FormSelect'
 import FormButtons from './FormButtons'
 import VueFooter from './Footer'
 
@@ -12,6 +13,7 @@ import VueFooter from './Footer'
     FieldError,
     FormWrapper,
     FormField,
+    FormSelect,
     FormButtons,
     VueFooter,
 ].forEach(Component => {
diff --git a/resources/js/langs/locales.js b/resources/js/langs/locales.js
index d30a61e8..8461bfa6 100644
--- a/resources/js/langs/locales.js
+++ b/resources/js/langs/locales.js
@@ -69,6 +69,7 @@ export default {
             "settings": "Settings",
             "account": "Account",
             "password": "Password",
+            "language": "Language",
             "confirm": [],
             "forms": {
                 "edit_settings": "Edit settings"
@@ -311,6 +312,7 @@ export default {
             "settings": "Réglages",
             "account": "Compte",
             "password": "Mot de passe",
+            "language": "Langue",
             "confirm": [],
             "forms": {
                 "edit_settings": "Modifier les réglages"
diff --git a/resources/js/views/profile/Settings.vue b/resources/js/views/profile/Settings.vue
index a9650fed..c8dacd07 100644
--- a/resources/js/views/profile/Settings.vue
+++ b/resources/js/views/profile/Settings.vue
@@ -1,7 +1,7 @@
 <template>
     <form-wrapper :fail="fail" :success="success">
         <form @submit.prevent="handleSubmit" @keydown="form.onKeydown($event)">
-            <form-field :form="form" fieldName="FirstSetting" :label="$t('auth.forms.FirstSetting')" />
+            <form-select :options="options" :form="form" fieldName="lang" :label="$t('settings.language')" />
             <form-buttons :isBusy="form.isBusy" :caption="$t('commons.save')" />
         </form>
     </form-wrapper>
@@ -17,8 +17,12 @@
                 success: '',
                 fail: '',
                 form: new Form({
-                    FirstSetting: ''
-                })
+                    lang: 'fr'
+                }),
+                options: [
+                    { text: 'en', value: 'en' },
+                    { text: 'fr', value: 'fr' },
+                ]
             }
         },
 
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index 3b5a4fbc..c2b5cc09 100644
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -16,6 +16,7 @@
     'settings' => 'Settings',
     'account' => 'Account',
     'password' => 'Password',
+    'language' => 'Language',
     'confirm' => [
 
     ],
diff --git a/resources/lang/fr/settings.php b/resources/lang/fr/settings.php
index 66037deb..19d62983 100644
--- a/resources/lang/fr/settings.php
+++ b/resources/lang/fr/settings.php
@@ -16,6 +16,7 @@
     'settings' => 'Réglages',
     'account' => 'Compte',
     'password' => 'Mot de passe',
+    'language' => 'Langue',
     'confirm' => [
 
     ],
diff --git a/resources/views/landing.blade.php b/resources/views/landing.blade.php
index c14977a3..e37e27e9 100644
--- a/resources/views/landing.blade.php
+++ b/resources/views/landing.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="has-background-black-ter" lang="en">
+<html class="has-background-black-ter" lang="{{ option('lang', 'en') }}">
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">