diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php
index c4ba3f05..0285c44b 100644
--- a/app/Http/Resources/UserResource.php
+++ b/app/Http/Resources/UserResource.php
@@ -25,6 +25,7 @@ class UserResource extends JsonResource
                     'stripe_customer' => is_null($this->stripe_id) ? false : true,
                     'email' => is_demo() ? obfuscate_email($this->email) : $this->email,
                     'role' => $this->role,
+                    'two_factor_authentication' => $this->two_factor_secret ? true : false,
                     'folders' => $this->folder_tree,
                     'storage' => $this->storage,
                     'created_at_formatted' => format_date($this->created_at, '%d. %B. %Y'),
diff --git a/config/language-translations.php b/config/language-translations.php
index 4184d450..1a986dad 100644
--- a/config/language-translations.php
+++ b/config/language-translations.php
@@ -524,6 +524,11 @@ return [
         'popup_upload_limit.title' => 'You exceed upload limit on single file',
         'popup_zipping.message' => 'Please wait until your files start downloading.',
         'popup_zipping.title' => 'Zipping Your Files...',
+        'popup_two_factor_authentication.title' => 'Two Factor Authentication Password Confirm',
+        'popup_two_factor_authentication.input_label' => 'Password',
+        'popup_two_factor_authentication.placeholder' => 'Type your password',
+        'popup_two_factor_authentication.help' => 'Scan the image above with the two-factor authentication app on your phone.',
+        'popup_two_factor_authentication.confirm_button' => 'Confirm',
         'preview_sorting.grid_view' => 'Grid View',
         'preview_sorting.list_view' => 'List View',
         'preview_sorting.preview_sorting_button' => 'View',
@@ -640,6 +645,8 @@ return [
         'user_settings.timezone_plac' => 'Select your timezone',
         'user_settings.title_account' => 'Account Information',
         'user_settings.title_billing' => 'Billing Information',
+        'validation_errors.incorrect_2fa_code' => 'Sorry, you passed incorrect code',
+        'validation_errors.incorrect_2fa_recovery_code' => 'Sorry, you passed incorrect recovery code',
         'validation_errors.incorrect_password' => 'Sorry, you passed incorrect password :(',
         'validation_errors.wrong_image' => 'You may have uploaded the wrong file, try again!',
         'app_description' => 'Your self-hosted storage cloud software powered by Laravel and Vue',
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index ddf7f122..8181edbc 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -53,7 +53,7 @@
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=2b856bf8204afcea4078",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=bc757f00e838ebeddad0",
     "/chunks/plans.js": "/chunks/plans.js?id=36ebc380b6e7773a04ff",
-    "/chunks/platform.js": "/chunks/platform.js?id=5a0101097d87433a7986",
+    "/chunks/platform.js": "/chunks/platform.js?id=ebc7a6fe1358ebab023f",
     "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=2224a6de276a2edc346b",
     "/chunks/profile.js": "/chunks/profile.js?id=20236b41dd811bfd492c",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=f532862b4c362de67360",
@@ -61,7 +61,7 @@
     "/chunks/settings.js": "/chunks/settings.js?id=f3273efbf6b6d723b8ea",
     "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=aa81750b0d9e206d5ee9",
     "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=3810f765b5305c2ce25c",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=6a2aa5bcfa99fde75a77",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=0bbdf437fd155e1d00bf",
     "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=c3c536eec45ffbbc77f4",
     "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=ee860273cc027ffa83c1",
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=d15d2096bcf308b21a50",
@@ -70,7 +70,7 @@
     "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=238c362399a4018549bd",
     "/chunks/shared/file-browser.js": "/chunks/shared/file-browser.js?id=d630c473dc6b751ec50f",
     "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=040a7241ea133456200c",
-    "/chunks/sign-in.js": "/chunks/sign-in.js?id=949ceec95f4a8325cbf3",
+    "/chunks/sign-in.js": "/chunks/sign-in.js?id=3a6512b001e6b8d9785a",
     "/chunks/sign-up.js": "/chunks/sign-up.js?id=f5634301e476029d6fa1",
     "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=20721ca146c27a67bccd",
     "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=d21cbdb1cee9197323c3",
@@ -91,40 +91,93 @@
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~d5e36d91.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~d5e36d91.js?id=170765b4fd923b62195c",
     "/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js": "/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser~chunks/shared/single-file.js?id=ca01bfe1656f58710763",
     "/vendors~chunks/platform~chunks/shared.js": "/vendors~chunks/platform~chunks/shared.js?id=eb141834bc24b72d8e92",
-    "/chunks/sign-in.8944159873fb3ac13fef.hot-update.js": "/chunks/sign-in.8944159873fb3ac13fef.hot-update.js",
-    "/chunks/sign-in.75cb3d2cf12e3f45d175.hot-update.js": "/chunks/sign-in.75cb3d2cf12e3f45d175.hot-update.js",
-    "/chunks/sign-in.729bff4dd920e0f1f41a.hot-update.js": "/chunks/sign-in.729bff4dd920e0f1f41a.hot-update.js",
-    "/chunks/sign-in.90669c169f16b57043eb.hot-update.js": "/chunks/sign-in.90669c169f16b57043eb.hot-update.js",
-    "/chunks/sign-in.50b9315adc692de91e6e.hot-update.js": "/chunks/sign-in.50b9315adc692de91e6e.hot-update.js",
-    "/chunks/sign-in.715ff1e6dcdaa4910de3.hot-update.js": "/chunks/sign-in.715ff1e6dcdaa4910de3.hot-update.js",
-    "/chunks/sign-in.8a6a097ff7b48e093939.hot-update.js": "/chunks/sign-in.8a6a097ff7b48e093939.hot-update.js",
-    "/chunks/sign-in.46d30c932b3d8d9dbd95.hot-update.js": "/chunks/sign-in.46d30c932b3d8d9dbd95.hot-update.js",
-    "/chunks/sign-in.a59d0f701426c969641c.hot-update.js": "/chunks/sign-in.a59d0f701426c969641c.hot-update.js",
-    "/chunks/sign-in.2e40826ff67c58c6ed3e.hot-update.js": "/chunks/sign-in.2e40826ff67c58c6ed3e.hot-update.js",
-    "/chunks/sign-in.84c5dfa58c23e943e8de.hot-update.js": "/chunks/sign-in.84c5dfa58c23e943e8de.hot-update.js",
-    "/chunks/sign-in.7c45a9da1a784ba0fb28.hot-update.js": "/chunks/sign-in.7c45a9da1a784ba0fb28.hot-update.js",
-    "/chunks/sign-in.277ba1e57ae1b9532188.hot-update.js": "/chunks/sign-in.277ba1e57ae1b9532188.hot-update.js",
-    "/chunks/sign-in.a2a4c8724323f35fe2fc.hot-update.js": "/chunks/sign-in.a2a4c8724323f35fe2fc.hot-update.js",
-    "/chunks/sign-in.1ae99812bef1c257f111.hot-update.js": "/chunks/sign-in.1ae99812bef1c257f111.hot-update.js",
-    "/chunks/sign-in.fcb40ce9e15b9da70236.hot-update.js": "/chunks/sign-in.fcb40ce9e15b9da70236.hot-update.js",
-    "/chunks/sign-in.dedc702a2543a419472a.hot-update.js": "/chunks/sign-in.dedc702a2543a419472a.hot-update.js",
-    "/chunks/sign-in.d107b8c7fd8cd66a8c82.hot-update.js": "/chunks/sign-in.d107b8c7fd8cd66a8c82.hot-update.js",
-    "/chunks/sign-in.4f7552d8551ef72b0d2a.hot-update.js": "/chunks/sign-in.4f7552d8551ef72b0d2a.hot-update.js",
-    "/chunks/sign-in.38379efb36005d0c04b0.hot-update.js": "/chunks/sign-in.38379efb36005d0c04b0.hot-update.js",
-    "/chunks/sign-in.10ccd5e13b40458a9922.hot-update.js": "/chunks/sign-in.10ccd5e13b40458a9922.hot-update.js",
-    "/chunks/sign-in.ad5a33847ca334061269.hot-update.js": "/chunks/sign-in.ad5a33847ca334061269.hot-update.js",
-    "/chunks/sign-in.8145c52ffe519bd17d37.hot-update.js": "/chunks/sign-in.8145c52ffe519bd17d37.hot-update.js",
-    "/chunks/sign-in.0ee1b8ac9013dccd4ec9.hot-update.js": "/chunks/sign-in.0ee1b8ac9013dccd4ec9.hot-update.js",
-    "/chunks/sign-in.4eb230d53fde24d16747.hot-update.js": "/chunks/sign-in.4eb230d53fde24d16747.hot-update.js",
-    "/chunks/sign-in.f1970e090d9245380a59.hot-update.js": "/chunks/sign-in.f1970e090d9245380a59.hot-update.js",
-    "/chunks/sign-in.3464c74313f726061ba7.hot-update.js": "/chunks/sign-in.3464c74313f726061ba7.hot-update.js",
-    "/chunks/sign-in.c73835f25ea1f5db1e92.hot-update.js": "/chunks/sign-in.c73835f25ea1f5db1e92.hot-update.js",
-    "/chunks/sign-in.18b3afbd7f399ccd92c4.hot-update.js": "/chunks/sign-in.18b3afbd7f399ccd92c4.hot-update.js",
-    "/chunks/sign-in.78bc71b296288b1cfc7b.hot-update.js": "/chunks/sign-in.78bc71b296288b1cfc7b.hot-update.js",
-    "/chunks/sign-in.c1dfe680eb1d42852c82.hot-update.js": "/chunks/sign-in.c1dfe680eb1d42852c82.hot-update.js",
-    "/chunks/sign-in.4ff61daab837f57cd09e.hot-update.js": "/chunks/sign-in.4ff61daab837f57cd09e.hot-update.js",
-    "/chunks/sign-in.40b44068090a59d03897.hot-update.js": "/chunks/sign-in.40b44068090a59d03897.hot-update.js",
-    "/chunks/sign-in.39496c19f36fda3d8e7b.hot-update.js": "/chunks/sign-in.39496c19f36fda3d8e7b.hot-update.js",
-    "/chunks/sign-in.23b65a3918af564ccfb7.hot-update.js": "/chunks/sign-in.23b65a3918af564ccfb7.hot-update.js",
-    "/chunks/sign-in.f604a37c86fbdefb0b6b.hot-update.js": "/chunks/sign-in.f604a37c86fbdefb0b6b.hot-update.js"
+    "/chunks/platform.2da23f4f830ea95c2db7.hot-update.js": "/chunks/platform.2da23f4f830ea95c2db7.hot-update.js",
+    "/chunks/platform.f09893cba29176c1d049.hot-update.js": "/chunks/platform.f09893cba29176c1d049.hot-update.js",
+    "/chunks/platform.69efc1eacf9203169967.hot-update.js": "/chunks/platform.69efc1eacf9203169967.hot-update.js",
+    "/chunks/platform.b2e3ac9202bc1629d569.hot-update.js": "/chunks/platform.b2e3ac9202bc1629d569.hot-update.js",
+    "/chunks/platform.3d90ac0f776f32cc839d.hot-update.js": "/chunks/platform.3d90ac0f776f32cc839d.hot-update.js",
+    "/chunks/platform.94db67fd0dc30f8ad24c.hot-update.js": "/chunks/platform.94db67fd0dc30f8ad24c.hot-update.js",
+    "/chunks/platform.47fdd81c6409887e7cea.hot-update.js": "/chunks/platform.47fdd81c6409887e7cea.hot-update.js",
+    "/chunks/platform.fa3d4f434d8a3da06db0.hot-update.js": "/chunks/platform.fa3d4f434d8a3da06db0.hot-update.js",
+    "/chunks/platform.a63b8a7a46a1d93112b7.hot-update.js": "/chunks/platform.a63b8a7a46a1d93112b7.hot-update.js",
+    "/chunks/platform.d48cb3d4d402c04ad3d8.hot-update.js": "/chunks/platform.d48cb3d4d402c04ad3d8.hot-update.js",
+    "/chunks/platform.bfa33f8f2234db43ea2e.hot-update.js": "/chunks/platform.bfa33f8f2234db43ea2e.hot-update.js",
+    "/chunks/platform.202c41499dc917dc05c5.hot-update.js": "/chunks/platform.202c41499dc917dc05c5.hot-update.js",
+    "/chunks/settings-password.0e14bad1dea5754d8c2f.hot-update.js": "/chunks/settings-password.0e14bad1dea5754d8c2f.hot-update.js",
+    "/chunks/settings-password.994643f7a88fd1e4a4d5.hot-update.js": "/chunks/settings-password.994643f7a88fd1e4a4d5.hot-update.js",
+    "/chunks/settings-password.7107a22e85b05bf5d786.hot-update.js": "/chunks/settings-password.7107a22e85b05bf5d786.hot-update.js",
+    "/chunks/settings-password.15d44d72936a763952bf.hot-update.js": "/chunks/settings-password.15d44d72936a763952bf.hot-update.js",
+    "/chunks/settings-password.b7aa3cd486c35f8db3b5.hot-update.js": "/chunks/settings-password.b7aa3cd486c35f8db3b5.hot-update.js",
+    "/chunks/settings-password.92f222a7454f0538b155.hot-update.js": "/chunks/settings-password.92f222a7454f0538b155.hot-update.js",
+    "/chunks/settings-password.03cfd97e49fb6ef671f8.hot-update.js": "/chunks/settings-password.03cfd97e49fb6ef671f8.hot-update.js",
+    "/chunks/settings-password.6e5b6c561508874a8122.hot-update.js": "/chunks/settings-password.6e5b6c561508874a8122.hot-update.js",
+    "/chunks/settings-password.dc0c41e134e292b05816.hot-update.js": "/chunks/settings-password.dc0c41e134e292b05816.hot-update.js",
+    "/chunks/settings-password.db4c718926980681056c.hot-update.js": "/chunks/settings-password.db4c718926980681056c.hot-update.js",
+    "/chunks/settings-password.1c6394cbad1be8b446d1.hot-update.js": "/chunks/settings-password.1c6394cbad1be8b446d1.hot-update.js",
+    "/chunks/settings-password.4e44151550b6288443fa.hot-update.js": "/chunks/settings-password.4e44151550b6288443fa.hot-update.js",
+    "/chunks/settings-password.9c9131b626b538b5d429.hot-update.js": "/chunks/settings-password.9c9131b626b538b5d429.hot-update.js",
+    "/chunks/settings-password.5322d5921290c3bc7358.hot-update.js": "/chunks/settings-password.5322d5921290c3bc7358.hot-update.js",
+    "/chunks/settings-password.841b416c54b3f667e354.hot-update.js": "/chunks/settings-password.841b416c54b3f667e354.hot-update.js",
+    "/chunks/settings-password.debac9f48c4a2fe70791.hot-update.js": "/chunks/settings-password.debac9f48c4a2fe70791.hot-update.js",
+    "/chunks/settings-password.47a3b6c0bf83565f241a.hot-update.js": "/chunks/settings-password.47a3b6c0bf83565f241a.hot-update.js",
+    "/chunks/settings-password.19a9bedefd286a849ad4.hot-update.js": "/chunks/settings-password.19a9bedefd286a849ad4.hot-update.js",
+    "/chunks/settings-password.77cb444526041bc7a8fc.hot-update.js": "/chunks/settings-password.77cb444526041bc7a8fc.hot-update.js",
+    "/chunks/settings-password.4ce8b8c5216ae48e6527.hot-update.js": "/chunks/settings-password.4ce8b8c5216ae48e6527.hot-update.js",
+    "/chunks/settings-password.49ec7d70150d83ddee79.hot-update.js": "/chunks/settings-password.49ec7d70150d83ddee79.hot-update.js",
+    "/chunks/settings-password.5011c27a48db36e53f5e.hot-update.js": "/chunks/settings-password.5011c27a48db36e53f5e.hot-update.js",
+    "/chunks/settings-password.86d0a814ec25951b1d02.hot-update.js": "/chunks/settings-password.86d0a814ec25951b1d02.hot-update.js",
+    "/chunks/settings-password.b05d50ca0ec015df2222.hot-update.js": "/chunks/settings-password.b05d50ca0ec015df2222.hot-update.js",
+    "/chunks/settings-password.5df23f094e9638334829.hot-update.js": "/chunks/settings-password.5df23f094e9638334829.hot-update.js",
+    "/chunks/settings-password.2cfd808edd63fd80bb4e.hot-update.js": "/chunks/settings-password.2cfd808edd63fd80bb4e.hot-update.js",
+    "/chunks/settings-password.173cc163a8be23077788.hot-update.js": "/chunks/settings-password.173cc163a8be23077788.hot-update.js",
+    "/chunks/settings-password.802353accdc7b99f6b49.hot-update.js": "/chunks/settings-password.802353accdc7b99f6b49.hot-update.js",
+    "/chunks/settings-password.7fc9e3f4696cc97c60cb.hot-update.js": "/chunks/settings-password.7fc9e3f4696cc97c60cb.hot-update.js",
+    "/chunks/settings-password.815e6d591be8dac21872.hot-update.js": "/chunks/settings-password.815e6d591be8dac21872.hot-update.js",
+    "/chunks/settings-password.8abc737f7cf5d2fa6e9d.hot-update.js": "/chunks/settings-password.8abc737f7cf5d2fa6e9d.hot-update.js",
+    "/chunks/settings-password.3fdfc6e416d016300960.hot-update.js": "/chunks/settings-password.3fdfc6e416d016300960.hot-update.js",
+    "/chunks/settings-password.8e791951efec835a9fd8.hot-update.js": "/chunks/settings-password.8e791951efec835a9fd8.hot-update.js",
+    "/chunks/admin-account.942c028890dbdd100275.hot-update.js": "/chunks/admin-account.942c028890dbdd100275.hot-update.js",
+    "/chunks/app-index.942c028890dbdd100275.hot-update.js": "/chunks/app-index.942c028890dbdd100275.hot-update.js",
+    "/chunks/app-language.942c028890dbdd100275.hot-update.js": "/chunks/app-language.942c028890dbdd100275.hot-update.js",
+    "/chunks/app-others.942c028890dbdd100275.hot-update.js": "/chunks/app-others.942c028890dbdd100275.hot-update.js",
+    "/chunks/app-payments.942c028890dbdd100275.hot-update.js": "/chunks/app-payments.942c028890dbdd100275.hot-update.js",
+    "/chunks/app-setup.942c028890dbdd100275.hot-update.js": "/chunks/app-setup.942c028890dbdd100275.hot-update.js",
+    "/chunks/dashboard.942c028890dbdd100275.hot-update.js": "/chunks/dashboard.942c028890dbdd100275.hot-update.js",
+    "/chunks/invoices.942c028890dbdd100275.hot-update.js": "/chunks/invoices.942c028890dbdd100275.hot-update.js",
+    "/chunks/page-edit.942c028890dbdd100275.hot-update.js": "/chunks/page-edit.942c028890dbdd100275.hot-update.js",
+    "/chunks/pages.942c028890dbdd100275.hot-update.js": "/chunks/pages.942c028890dbdd100275.hot-update.js",
+    "/chunks/plan-settings.942c028890dbdd100275.hot-update.js": "/chunks/plan-settings.942c028890dbdd100275.hot-update.js",
+    "/chunks/plans.942c028890dbdd100275.hot-update.js": "/chunks/plans.942c028890dbdd100275.hot-update.js",
+    "/chunks/platform.942c028890dbdd100275.hot-update.js": "/chunks/platform.942c028890dbdd100275.hot-update.js",
+    "/chunks/settings-create-payment-methods.942c028890dbdd100275.hot-update.js": "/chunks/settings-create-payment-methods.942c028890dbdd100275.hot-update.js",
+    "/chunks/settings-password.942c028890dbdd100275.hot-update.js": "/chunks/settings-password.942c028890dbdd100275.hot-update.js",
+    "/chunks/settings-password.cef9963a6cc1fbdde51a.hot-update.js": "/chunks/settings-password.cef9963a6cc1fbdde51a.hot-update.js",
+    "/chunks/settings-password.c51ad5db88e30846ee52.hot-update.js": "/chunks/settings-password.c51ad5db88e30846ee52.hot-update.js",
+    "/chunks/settings-password.1c7c4a39d6b233b62e08.hot-update.js": "/chunks/settings-password.1c7c4a39d6b233b62e08.hot-update.js",
+    "/chunks/settings-password.99b407c6a1b4a724471f.hot-update.js": "/chunks/settings-password.99b407c6a1b4a724471f.hot-update.js",
+    "/chunks/settings-password.0bb21003120ba1130ddf.hot-update.js": "/chunks/settings-password.0bb21003120ba1130ddf.hot-update.js",
+    "/chunks/settings-password.61016a39a25bc88c3046.hot-update.js": "/chunks/settings-password.61016a39a25bc88c3046.hot-update.js",
+    "/chunks/settings-password.46347a168e565c65b2b3.hot-update.js": "/chunks/settings-password.46347a168e565c65b2b3.hot-update.js",
+    "/chunks/admin-account.e22aae3110ab93e66d86.hot-update.js": "/chunks/admin-account.e22aae3110ab93e66d86.hot-update.js",
+    "/chunks/app-index.e22aae3110ab93e66d86.hot-update.js": "/chunks/app-index.e22aae3110ab93e66d86.hot-update.js",
+    "/chunks/app-language.e22aae3110ab93e66d86.hot-update.js": "/chunks/app-language.e22aae3110ab93e66d86.hot-update.js",
+    "/chunks/app-others.e22aae3110ab93e66d86.hot-update.js": "/chunks/app-others.e22aae3110ab93e66d86.hot-update.js",
+    "/chunks/app-payments.e22aae3110ab93e66d86.hot-update.js": "/chunks/app-payments.e22aae3110ab93e66d86.hot-update.js",
+    "/chunks/app-setup.e22aae3110ab93e66d86.hot-update.js": "/chunks/app-setup.e22aae3110ab93e66d86.hot-update.js",
+    "/chunks/dashboard.e22aae3110ab93e66d86.hot-update.js": "/chunks/dashboard.e22aae3110ab93e66d86.hot-update.js",
+    "/chunks/invoices.e22aae3110ab93e66d86.hot-update.js": "/chunks/invoices.e22aae3110ab93e66d86.hot-update.js",
+    "/chunks/page-edit.e22aae3110ab93e66d86.hot-update.js": "/chunks/page-edit.e22aae3110ab93e66d86.hot-update.js",
+    "/chunks/pages.e22aae3110ab93e66d86.hot-update.js": "/chunks/pages.e22aae3110ab93e66d86.hot-update.js",
+    "/chunks/plan-settings.e22aae3110ab93e66d86.hot-update.js": "/chunks/plan-settings.e22aae3110ab93e66d86.hot-update.js",
+    "/chunks/plans.e22aae3110ab93e66d86.hot-update.js": "/chunks/plans.e22aae3110ab93e66d86.hot-update.js",
+    "/chunks/platform.e22aae3110ab93e66d86.hot-update.js": "/chunks/platform.e22aae3110ab93e66d86.hot-update.js",
+    "/chunks/settings-create-payment-methods.e22aae3110ab93e66d86.hot-update.js": "/chunks/settings-create-payment-methods.e22aae3110ab93e66d86.hot-update.js",
+    "/chunks/settings-password.e22aae3110ab93e66d86.hot-update.js": "/chunks/settings-password.e22aae3110ab93e66d86.hot-update.js",
+    "/chunks/settings-password.23a69d6d34870e53fa26.hot-update.js": "/chunks/settings-password.23a69d6d34870e53fa26.hot-update.js",
+    "/chunks/settings-password.c8f9be315b2d8adc0ce8.hot-update.js": "/chunks/settings-password.c8f9be315b2d8adc0ce8.hot-update.js",
+    "/chunks/settings-password.e0be0d96876c405eaf7b.hot-update.js": "/chunks/settings-password.e0be0d96876c405eaf7b.hot-update.js",
+    "/chunks/settings-password.44792a704c343db2fce0.hot-update.js": "/chunks/settings-password.44792a704c343db2fce0.hot-update.js",
+    "/chunks/platform.8aa58e6aedf2d55e5e13.hot-update.js": "/chunks/platform.8aa58e6aedf2d55e5e13.hot-update.js",
+    "/chunks/platform.4e9e1e917f75ffb1a912.hot-update.js": "/chunks/platform.4e9e1e917f75ffb1a912.hot-update.js",
+    "/chunks/platform.63071c87a8948c12b21b.hot-update.js": "/chunks/platform.63071c87a8948c12b21b.hot-update.js"
 }
diff --git a/resources/js/components/Others/TwoFactorAuthenticationConfirm.vue b/resources/js/components/Others/TwoFactorAuthenticationConfirm.vue
new file mode 100644
index 00000000..383637c0
--- /dev/null
+++ b/resources/js/components/Others/TwoFactorAuthenticationConfirm.vue
@@ -0,0 +1,179 @@
+<template>
+    <PopupWrapper name="two-factor-authentication-confirm">
+
+        <PopupHeader :title="$t('popup_two_factor_authentication.title')" icon="edit"/>
+
+        <PopupContent>
+             <ValidationObserver @submit.prevent="confirmPassword" v-if="! qrCode" ref="passwordForm" v-slot="{ invalid }" tag="form" class="form-wrapper">
+
+                <ValidationProvider tag="div" mode="passive" class="input-wrapper password" name="Password" rules="required" v-slot="{ errors }">
+                    <label class="input-label"> {{ $t('popup_two_factor_authentication.input_label') }}:</label>
+                    <input v-model="password" :class="{'is-error': errors[0]}" type="password" ref="input" class="focus-border-theme" :placeholder="$t('popup_two_factor_authentication.input_label')">
+                    <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
+                </ValidationProvider>
+            </ValidationObserver>
+
+            <div v-if="qrCode" class="qr-code-wrapper">
+                <div class="qr-code">
+                    <div v-html="qrCode"></div>
+                </div>
+
+                <small class="input-help" v-html="$t('popup_two_factor_authentication.help')" ></small>
+            </div>
+        </PopupContent>
+
+        <PopupActions>
+            <ButtonBase
+                class="popup-button"
+                @click.native="$closePopup()"
+                button-style="secondary"
+            >
+                {{ $t('global.cancel') }}
+            </ButtonBase>
+            <ButtonBase
+                v-if="! qrCode"
+                class="popup-button"
+                @click.native="confirmPassword"
+                button-style="theme"
+                :loading="isLoading"
+                :disabled="isLoading"
+            >
+               {{ $t('popup_two_factor_authentication.confirm_button') }}
+            </ButtonBase>
+        </PopupActions>
+
+    </PopupWrapper>
+</template>
+
+<script>
+import {ValidationProvider, ValidationObserver} from 'vee-validate/dist/vee-validate.full'
+import PopupWrapper from '@/components/Others/Popup/PopupWrapper'
+import PopupActions from '@/components/Others/Popup/PopupActions'
+import PopupContent from '@/components/Others/Popup/PopupContent'
+import PopupHeader from '@/components/Others/Popup/PopupHeader'
+import ButtonBase from '@/components/FilesView/ButtonBase'
+import {required} from 'vee-validate/dist/rules'
+import {mapGetters} from 'vuex'
+import {events} from '@/bus'
+import axios from 'axios'
+
+export default {
+    name: "TwoFactorAuthenticationConfirm",
+    components: {
+        ValidationProvider,
+        ValidationObserver,
+        PopupWrapper,
+        PopupActions,
+        PopupContent,
+        PopupHeader,
+        ButtonBase,
+        required,
+    },
+    computed: {
+        ...mapGetters(['user'])
+    },
+    data () {
+        return {
+            isLoading: false,
+            password: '',
+            qrCode: '',
+        }
+    },
+    methods: {
+        confirmPassword () {
+
+            this.isLoading = true
+
+            axios.
+                post('/user/confirm-password', {
+                    password: this.password
+                })
+                .then(() => {
+
+                   if(! this.user.data.attributes.two_factor_authentication) {
+
+                       this.enable()
+                   } else {
+
+                       this.disable()
+                   }
+
+                    this.isLoading = false
+                })
+                .catch(error => {
+
+                    if (error.response.status == 422) {
+
+                        this.$refs.passwordForm.setErrors({
+                            'Password': this.$t('validation_errors.incorrect_password')
+                        });
+                    }
+                })
+        },
+        enable() {
+
+            axios.
+                post('/user/two-factor-authentication')
+                .then(() => {
+
+                    this.$store.commit('CHANGE_TWO_FACTOR_AUTHENTICATION_STATE', true)
+
+                    this.getQrCode()
+                })
+                .catch(() => {
+                    this.$isSomethingWrong()
+                })
+        },
+        disable() {
+
+            axios.
+                delete('/user/two-factor-authentication')
+                .then(() => {
+
+                    this.$store.commit('CHANGE_TWO_FACTOR_AUTHENTICATION_STATE', false)
+
+                    this.$closePopup()
+                })
+                .catch(() => {
+                    this.$isSomethingWrong()
+                })
+        },
+        getQrCode() {
+            
+            axios.
+                get('/user/two-factor-qr-code')
+                .then((response) => {
+                    this.qrCode = response.data.svg
+                })
+                .catch(() => {
+                    this.$isSomethingWrong()
+                })
+        },
+    },
+    mounted () {
+
+        events.$on('popup:open', ({name}) => {
+
+            if (name === 'two-factor-authentication-confirm')
+                this.password = ''
+                this.qrCode = ''
+        })
+        }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@assets/vuefilemanager/_inapp-forms.scss";
+@import '@assets/vuefilemanager/_forms';
+
+.qr-code-wrapper {
+    padding: 0px 20px;
+
+    .qr-code {
+        display: flex;
+        justify-content: center;
+        margin: 20px 0px 20px 0px;
+    }
+}
+
+</style>
diff --git a/resources/js/store/modules/userAuth.js b/resources/js/store/modules/userAuth.js
index f2df1f76..6b511343 100644
--- a/resources/js/store/modules/userAuth.js
+++ b/resources/js/store/modules/userAuth.js
@@ -108,6 +108,9 @@ const actions = {
 }
 
 const mutations = {
+    CHANGE_TWO_FACTOR_AUTHENTICATION_STATE(state, condition) {
+        state.user.data.attributes.two_factor_authentication = condition
+    },
     RETRIEVE_USER(state, user) {
         state.user = user
     },
diff --git a/resources/js/views/Auth/SignIn.vue b/resources/js/views/Auth/SignIn.vue
index c075ce01..5c15d2d3 100644
--- a/resources/js/views/Auth/SignIn.vue
+++ b/resources/js/views/Auth/SignIn.vue
@@ -303,7 +303,7 @@
                                 if(! recovery) {
 
                                     this.$refs.two_factor_authentication.setErrors({
-                                        'Two Factor Authentication' : 'Incorrect code' 
+                                        'Two Factor Authentication' : this.$t('validation_errors.incorrect_2fa_code')
                                     })
                                 } 
                                 
@@ -311,7 +311,7 @@
                                 if(recovery) {
                                     
                                     this.$refs.two_factor_recovery.setErrors({
-                                        'Two Factor Recovery' : 'Incorrect recovery code' 
+                                        'Two Factor Recovery' : this.$t('validation_errors.incorrect_2fa_recovery_code')
                                     })
                                 }
                             }
diff --git a/resources/js/views/Platform.vue b/resources/js/views/Platform.vue
index bc424ffa..66ff0b7d 100644
--- a/resources/js/views/Platform.vue
+++ b/resources/js/views/Platform.vue
@@ -29,12 +29,15 @@
 
         <!--Others-->
         <DragUI />
+        <TwoFactorAuthenticationConfirm />
+
 
         <router-view :class="{'is-scaled-down': isScaledDown}" />
     </div>
 </template>
 
 <script>
+    import TwoFactorAuthenticationConfirm from '@/components/Others/TwoFactorAuthenticationConfirm'
     import MultiSelectToolbarMobile from '@/components/FilesView/MultiSelectToolbarMobile'
     import FileSortingMobile from '@/components/FilesView/FileSortingMobile'
     import SidebarNavigation from '@/components/Sidebar/SidebarNavigation'
@@ -56,6 +59,7 @@
     export default {
         name: 'Platform',
         components: {
+            TwoFactorAuthenticationConfirm,
             MultiSelectToolbarMobile,
             CreateFolderPopup,
             FileSortingMobile,
diff --git a/resources/js/views/User/Password.vue b/resources/js/views/User/Password.vue
index 9d40ab06..cc335280 100644
--- a/resources/js/views/User/Password.vue
+++ b/resources/js/views/User/Password.vue
@@ -32,6 +32,27 @@
                 </div>
             </ValidationObserver>
         </PageTabGroup>
+
+        <PageTabGroup class="form block-form">
+            <FormLabel> Two Factor Authentication </FormLabel>
+
+            <div class="block-wrapper">
+                    <div class="input-wrapper">
+                        <div class="inline-wrapper">
+                            <div class="switch-label">
+                                <label class="input-label">
+                                    Enable / Disable Two factor authentication
+                                </label>
+                                <small class="input-help" v-html="$t('admin_settings.others.allow_registration_help')"></small>
+                            </div>
+                            <SwitchInput @click.native.prevent.stop="open2faPopup"
+                                         class="switch"
+                                         :state="user.data.attributes.two_factor_authentication"
+                            />
+                        </div>
+                    </div>
+                </div>
+        </PageTabGroup>
     </PageTab>
 </template>
 
@@ -45,6 +66,8 @@
     import PageTab from '@/components/Others/Layout/PageTab'
     import PageHeader from '@/components/Others/PageHeader'
     import ThemeLabel from '@/components/Others/ThemeLabel'
+    import SwitchInput from '@/components/Others/Forms/SwitchInput'
+    import {mapGetters} from 'vuex'
     import {required} from 'vee-validate/dist/rules'
     import {events} from '@/bus'
     import axios from 'axios'
@@ -58,12 +81,16 @@
             ValidationProvider,
             ValidationObserver,
             UserImageInput,
+            SwitchInput,
             MobileHeader,
             PageHeader,
             ButtonBase,
             ThemeLabel,
             required,
         },
+        computed: {
+            ...mapGetters(['user'])
+        },
         data() {
             return {
                 newPasswordConfirmation: '',
@@ -112,6 +139,9 @@
                             }
                         }
                     })
+            },
+            open2faPopup() {
+                events.$emit('popup:open', {name: 'two-factor-authentication-confirm'})
             }
         }
     }
diff --git a/webpack.mix.js b/webpack.mix.js
index 2d5c236f..7ec5d56b 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -34,12 +34,12 @@ mix.js('resources/js/main.js', 'public/js')
             clientLogLevel: 'none'
         }
     })
-    .options({
-        hmrOptions: {
-            host: '192.168.1.198',
-            port: '8080'
-        },
-    })
+    // .options({
+    //     hmrOptions: {
+    //         host: '192.168.1.198',
+    //         port: '8080'
+    //     },
+    // })
     .disableNotifications();
 
 if (mix.inProduction()) {