diff --git a/app/Http/Controllers/Profile/AccountController.php b/app/Http/Controllers/Settings/AccountController.php
similarity index 96%
rename from app/Http/Controllers/Profile/AccountController.php
rename to app/Http/Controllers/Settings/AccountController.php
index 217da03c..04cf89b2 100644
--- a/app/Http/Controllers/Profile/AccountController.php
+++ b/app/Http/Controllers/Settings/AccountController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Profile;
+namespace App\Http\Controllers\Settings;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
diff --git a/app/Http/Controllers/Profile/SettingController.php b/app/Http/Controllers/Settings/OptionController.php
similarity index 90%
rename from app/Http/Controllers/Profile/SettingController.php
rename to app/Http/Controllers/Settings/OptionController.php
index dbe3f1dc..929fa945 100644
--- a/app/Http/Controllers/Profile/SettingController.php
+++ b/app/Http/Controllers/Settings/OptionController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Profile;
+namespace App\Http\Controllers\Settings;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use App\Http\Controllers\Controller;
 
-class SettingController extends Controller
+class OptionController extends Controller
 {
 
 
diff --git a/app/Http/Controllers/Profile/PasswordController.php b/app/Http/Controllers/Settings/PasswordController.php
similarity index 95%
rename from app/Http/Controllers/Profile/PasswordController.php
rename to app/Http/Controllers/Settings/PasswordController.php
index cc84ada7..41b32a16 100644
--- a/app/Http/Controllers/Profile/PasswordController.php
+++ b/app/Http/Controllers/Settings/PasswordController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Profile;
+namespace App\Http\Controllers\Settings;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
diff --git a/resources/js/components/Footer.vue b/resources/js/components/Footer.vue
index a780f213..7cb2ea76 100644
--- a/resources/js/components/Footer.vue
+++ b/resources/js/components/Footer.vue
@@ -8,7 +8,7 @@
             </div>
         </div>
         <div class="content has-text-centered">
-            <router-link :to="{ name: 'profile' }" class="has-text-grey">{{ $t('commons.profile') }}</router-link> - <a class="has-text-grey" @click="logout">{{ $t('auth.sign_out') }}</a>
+            <router-link :to="{ name: 'settings' }" class="has-text-grey">{{ $t('settings.settings') }}</router-link> - <a class="has-text-grey" @click="logout">{{ $t('auth.sign_out') }}</a>
         </div>
     </footer>
 </template>
diff --git a/resources/js/langs/locales.js b/resources/js/langs/locales.js
index 62bd6668..bf0f5b17 100644
--- a/resources/js/langs/locales.js
+++ b/resources/js/langs/locales.js
@@ -79,6 +79,7 @@ export default {
             "settings": "Settings",
             "account": "Account",
             "password": "Password",
+            "options": "Options",
             "confirm": [],
             "forms": {
                 "edit_settings": "Edit settings",
@@ -283,7 +284,7 @@ export default {
                 "already_register": "Déjà enregistré ?",
                 "password_do_not_match": "Le mot de passe ne correspond pas",
                 "forgot_your_password": "Mot de passe oublié ?",
-                "request_password_reset": "Réinitialiser le",
+                "request_password_reset": "Réinitialiser le mot de passe",
                 "reset_password": "Mot de passe oublié",
                 "new_password": "Nouveau mot de passe",
                 "current_password": {
@@ -341,6 +342,7 @@ export default {
             "settings": "Réglages",
             "account": "Compte",
             "password": "Mot de passe",
+            "options": "Options",
             "confirm": [],
             "forms": {
                 "edit_settings": "Modifier les réglages",
diff --git a/resources/js/routes.js b/resources/js/routes.js
index c4336246..40199642 100644
--- a/resources/js/routes.js
+++ b/resources/js/routes.js
@@ -10,7 +10,7 @@ import Login            from './views/auth/Login'
 import Register         from './views/auth/Register'
 import PasswordRequest  from './views/auth/password/Request'
 import PasswordReset    from './views/auth/password/Reset'
-import Profile          from './views/profile/Index'
+import Settings          from './views/Settings/Index'
 import Errors           from './views/Error'
 
 const router = new Router({
@@ -19,7 +19,7 @@ const router = new Router({
         { path: '/', name: 'accounts', component: Accounts, props: true },
         { path: '/login', name: 'login',component: Login },
         { path: '/register', name: 'register',component: Register },
-        { path: '/profile', name: 'profile',component: Profile },
+        { path: '/settings', name: 'settings',component: Settings },
         { path: '/create', name: 'create',component: Create },
         { path: '/edit/:twofaccountId', name: 'edit',component: Edit },
 
diff --git a/resources/js/views/profile/Account.vue b/resources/js/views/Settings/Account.vue
similarity index 92%
rename from resources/js/views/profile/Account.vue
rename to resources/js/views/Settings/Account.vue
index 72193eb9..2ebcd641 100644
--- a/resources/js/views/profile/Account.vue
+++ b/resources/js/views/Settings/Account.vue
@@ -27,7 +27,7 @@
         },
 
         async mounted() {
-            const { data } = await this.form.get('/api/profile/account')
+            const { data } = await this.form.get('/api/settings/account')
 
             this.form.fill(data)
         },
@@ -39,7 +39,7 @@
                 this.fail = ''
                 this.success = ''
 
-                this.form.patch('/api/profile/account', {returnError: true})
+                this.form.patch('/api/settings/account', {returnError: true})
                 .then(response => {
 
                     this.success = response.data.message
diff --git a/resources/js/views/profile/Index.vue b/resources/js/views/Settings/Index.vue
similarity index 88%
rename from resources/js/views/profile/Index.vue
rename to resources/js/views/Settings/Index.vue
index 9ab6795f..0da694b3 100644
--- a/resources/js/views/profile/Index.vue
+++ b/resources/js/views/Settings/Index.vue
@@ -11,7 +11,7 @@
         		</div>
             </div>
     	</div>
-        <settings v-if="activeTab === $t('settings.settings')"></settings>
+        <options v-if="activeTab === $t('settings.options')"></options>
         <account v-if="activeTab === $t('settings.account')"></account>
         <password v-if="activeTab === $t('settings.password')"></password>
         <vue-footer :showButtons="true">
@@ -25,7 +25,7 @@
 
 <script>
 
-    import Settings from './Settings'
+    import Options from './Options'
     import Account 	from './Account'
     import Password from './Password'
 
@@ -34,7 +34,7 @@
             return {
                 tabs: [
                 	{
-                		'name' : this.$t('settings.settings'),
+                		'name' : this.$t('settings.options'),
                 		'isActive': true
                 	},
                 	{
@@ -46,12 +46,12 @@
                 		'isActive': false
                 	},
             	],
-            	activeTab: this.$t('settings.settings')
+            	activeTab: this.$t('settings.options')
             }
         },
 
         components: {
-        	Settings,
+        	Options,
             Account,
             Password
         },
diff --git a/resources/js/views/profile/Settings.vue b/resources/js/views/Settings/Options.vue
similarity index 96%
rename from resources/js/views/profile/Settings.vue
rename to resources/js/views/Settings/Options.vue
index a0c68286..6c2c3372 100644
--- a/resources/js/views/profile/Settings.vue
+++ b/resources/js/views/Settings/Options.vue
@@ -34,7 +34,7 @@
                 this.fail = ''
                 this.success = ''
 
-                this.form.post('/api/profile/settings', {returnError: true})
+                this.form.post('/api/settings/options', {returnError: true})
                 .then(response => {
 
                     this.success = response.data.message
diff --git a/resources/js/views/profile/Password.vue b/resources/js/views/Settings/Password.vue
similarity index 95%
rename from resources/js/views/profile/Password.vue
rename to resources/js/views/Settings/Password.vue
index ed8e04a6..eb8106b0 100644
--- a/resources/js/views/profile/Password.vue
+++ b/resources/js/views/Settings/Password.vue
@@ -33,7 +33,7 @@
                 this.fail = ''
                 this.success = ''
 
-                this.form.patch('/api/profile/password', {returnError: true})
+                this.form.patch('/api/settings/password', {returnError: true})
                 .then(response => {
 
                     this.success = response.data.message
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index 53e49fa8..9abfaddb 100644
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -16,6 +16,7 @@
     'settings' => 'Settings',
     'account' => 'Account',
     'password' => 'Password',
+    'options' => 'Options',
     'confirm' => [
 
     ],
diff --git a/resources/lang/fr/auth.php b/resources/lang/fr/auth.php
index def0ad6f..87a7f841 100644
--- a/resources/lang/fr/auth.php
+++ b/resources/lang/fr/auth.php
@@ -33,7 +33,7 @@
         'already_register' => 'Déjà enregistré ?',
         'password_do_not_match' => 'Le mot de passe ne correspond pas',
         'forgot_your_password' => 'Mot de passe oublié ?',
-        'request_password_reset' => 'Réinitialiser le',
+        'request_password_reset' => 'Réinitialiser le mot de passe',
         'reset_password' => 'Mot de passe oublié',
         'new_password' => 'Nouveau mot de passe',
         'current_password' => [
diff --git a/resources/lang/fr/settings.php b/resources/lang/fr/settings.php
index 68d05af5..47aedd5b 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',
+    'options' => 'Options',
     'confirm' => [
 
     ],
diff --git a/routes/api.php b/routes/api.php
index 155bf147..b74daae5 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -28,11 +28,11 @@
 
     Route::post('logout', 'Auth\LoginController@logout');
 
-    Route::get('profile/account', 'Profile\AccountController@show');
-    Route::patch('profile/account', 'Profile\AccountController@update');
-    Route::patch('profile/password', 'Profile\PasswordController@update');
-    Route::get('profile/settings', 'Profile\SettingController@index');
-    Route::post('profile/settings', 'Profile\SettingController@store');
+    Route::get('settings/account', 'Settings\AccountController@show');
+    Route::patch('settings/account', 'Settings\AccountController@update');
+    Route::patch('settings/password', 'Settings\PasswordController@update');
+    Route::get('settings/options', 'Settings\OptionController@index');
+    Route::post('settings/options', 'Settings\OptionController@store');
 
     Route::delete('twofaccounts/batch', 'TwoFAccountController@batchDestroy');
     Route::apiResource('twofaccounts', 'TwoFAccountController');
diff --git a/tests/Unit/ApiExceptionTest.php b/tests/Unit/ApiExceptionTest.php
index 46e39a1b..c778a530 100644
--- a/tests/Unit/ApiExceptionTest.php
+++ b/tests/Unit/ApiExceptionTest.php
@@ -35,7 +35,7 @@ public function setUp(): void
      */
     public function test_HTTP_UNAUTHORIZED()
     {
-        $response = $this->json('GET', '/api/profile/settings')
+        $response = $this->json('GET', '/api/settings/options')
             ->assertStatus(401)
             ->assertJson([
                 'message' => 'Unauthorized'
@@ -78,7 +78,7 @@ public function test_HTTP_NOT_FOUND()
     public function test_HTTP_METHOD_NOT_ALLOWED()
     {
         $response = $this->actingAs($this->user, 'api')
-            ->json('PATCH', '/api/profile/settings')
+            ->json('PATCH', '/api/settings/options')
             ->assertStatus(405)
             ->assertJson([
                 'message' => 'Method Not Allowed'
diff --git a/tests/Unit/Profile/AccountTest.php b/tests/Unit/Settings/AccountTest.php
similarity index 89%
rename from tests/Unit/Profile/AccountTest.php
rename to tests/Unit/Settings/AccountTest.php
index d68e20fd..4bb2567a 100644
--- a/tests/Unit/Profile/AccountTest.php
+++ b/tests/Unit/Settings/AccountTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\Profile;
+namespace Tests\Unit\Settings;
 
 use App\User;
 use Tests\TestCase;
@@ -32,7 +32,7 @@ public function testGetUserDetails()
         $user = User::find(1);
 
         $response = $this->actingAs($user, 'api')
-            ->json('GET', '/api/profile/account')
+            ->json('GET', '/api/settings/account')
             ->assertStatus(200)
             ->assertJsonStructure(['name', 'email']);
     }
@@ -48,7 +48,7 @@ public function testUserUpdateWithWrongCurrentPassword()
         $user = User::find(1);
 
         $response = $this->actingAs($user, 'api')
-            ->json('PATCH', '/api/profile/account', [
+            ->json('PATCH', '/api/settings/account', [
                 'name' => 'userUpdated',
                 'email' => 'userUpdated@example.org',
                 'password' => 'wrongPassword',
@@ -69,7 +69,7 @@ public function testUserUpdate()
         $user = User::find(1);
 
         $response = $this->actingAs($user, 'api')
-            ->json('PATCH', '/api/profile/account', [
+            ->json('PATCH', '/api/settings/account', [
                 'name' => 'userUpdated',
                 'email' => 'userUpdated@example.org',
                 'password' => 'password',
diff --git a/tests/Unit/Profile/SettingTest.php b/tests/Unit/Settings/OptionTest.php
similarity index 90%
rename from tests/Unit/Profile/SettingTest.php
rename to tests/Unit/Settings/OptionTest.php
index c0dab335..1b1c5075 100644
--- a/tests/Unit/Profile/SettingTest.php
+++ b/tests/Unit/Settings/OptionTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Unit\Profile;
+namespace Tests\Unit\Settings;
 
 use App\User;
 use Tests\TestCase;
 
-class SettingTest extends TestCase
+class OptionTest extends TestCase
 {
     /** @var \App\User */
     protected $user;
@@ -30,7 +30,7 @@ public function setUp(): void
     public function testSettingsStorage()
     {
         $response = $this->actingAs($this->user, 'api')
-            ->json('POST', '/api/profile/settings', [
+            ->json('POST', '/api/settings/options', [
                     'setting_1' => 'value_1',
                     'setting_2' => 'value_2',
                 ])
@@ -56,7 +56,7 @@ public function testSettingsIndexListing()
         option(['setting_2' => 'value_2']);
 
         $response = $this->actingAs($this->user, 'api')
-            ->json('GET', '/api/profile/settings')
+            ->json('GET', '/api/settings/options')
             ->assertStatus(200)
             ->assertJson([
                 'settings' => [
diff --git a/tests/Unit/Profile/PasswordTest.php b/tests/Unit/Settings/PasswordTest.php
similarity index 90%
rename from tests/Unit/Profile/PasswordTest.php
rename to tests/Unit/Settings/PasswordTest.php
index f30df26a..f122fa0c 100644
--- a/tests/Unit/Profile/PasswordTest.php
+++ b/tests/Unit/Settings/PasswordTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\Profile;
+namespace Tests\Unit\Settings;
 
 use App\User;
 use Tests\TestCase;
@@ -31,7 +31,7 @@ public function setUp(): void
     public function testPasswordUpdateWithWrongCurrentPassword()
     {        
         $response = $this->actingAs($this->user, 'api')
-            ->json('PATCH', '/api/profile/password', [
+            ->json('PATCH', '/api/settings/password', [
                 'currentPassword' => 'wrongPassword',
                 'password' => 'passwordUpdated',
                 'password_confirmation' => 'passwordUpdated',
@@ -50,7 +50,7 @@ public function testPasswordUpdateWithWrongCurrentPassword()
     public function testPasswordUpdate()
     {
         $response = $this->actingAs($this->user, 'api')
-            ->json('PATCH', '/api/profile/password', [
+            ->json('PATCH', '/api/settings/password', [
                 'currentPassword' => 'password',
                 'password' => 'passwordUpdated',
                 'password_confirmation' => 'passwordUpdated',