diff --git a/config/language-translations.php b/config/language-translations.php
index 6cfc5768..290de491 100644
--- a/config/language-translations.php
+++ b/config/language-translations.php
@@ -203,7 +203,7 @@ return [
         'col_amount'                                          => 'Amount',
         'total'                                               => 'Total',
     ],
-    'regular' => [
+    'regular'  => [
         'actions.close'                                      => 'Close',
         'actions.create_folder'                              => 'Create folder',
         'actions.delete'                                     => 'Delete item',
@@ -714,5 +714,18 @@ return [
         'popup_2fa.toaster_codes_copied'                     => 'Your codes was copied!',
         'popup_2fa.toaster_codes_regenerated'                => 'Your codes was regenerated!',
         'go_home'                                            => 'Go to the homepage',
+        'never'                                              => 'Never',
+        'last_used'                                          => 'Last Used',
+        'personal_token.section_title'                       => 'Personal Access Token',
+        'personal_token.section_description'                 => "You don't have any created personal access tokens yet.",
+        'personal_token.create_token'                        => 'Create Token',
+        'popup_personal_token.title'                         => 'Create Personal Token',
+        'popup_personal_token.label'                         => 'Token Name',
+        'popup_personal_token.plc'                           => 'Type token name...',
+        'popup_personal_token.your_token'                    => 'Your Personal Access Token',
+        'popup_personal_token.copy_token'                    => "Make sure to <b class='text-theme'>copy your personal access token now</b>. You won’t be able to see it again!",
+        'popup_delete_personal_token.title'                  => 'Are you sure you want to delete this token?',
+        'popup_delete_personal_token.description'            => 'Any applications or scripts using this token will no longer be able to access into your account. You cannot undo this action.',
+        'personal_token.token_deleted'                       => 'Token was successfully deleted!',
     ],
 ];
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 76e5495f..c7be3538 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -60,10 +60,10 @@
     "/chunks/profile.js": "/chunks/profile.js?id=41b536880e846017d2d0",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=fd25990d1ccec0294602",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=b35e751cdc1946a4fb60",
-    "/chunks/settings.js": "/chunks/settings.js?id=03e8ad7276ef26cb279e",
+    "/chunks/settings.js": "/chunks/settings.js?id=b7d5d142d6e4cae354b0",
     "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=0e818baec7f92c7fa542",
     "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=eab2781e9935230c6971",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=b6d2bfbdff952d9e60b3",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=b01b17b523e99064d8ca",
     "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=1a1c7f6e9c2857ec941f",
     "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=682f4f690ac252a78a3a",
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=4f1793d53633a2c4cc18",
@@ -267,5 +267,7 @@
     "/chunks/settings-password.a1ad87b73322e03760e1.hot-update.js": "/chunks/settings-password.a1ad87b73322e03760e1.hot-update.js",
     "/chunks/settings-password.b0506a2ed51f1ae20fe9.hot-update.js": "/chunks/settings-password.b0506a2ed51f1ae20fe9.hot-update.js",
     "/chunks/settings-password.0188e6bd0c54da3e5622.hot-update.js": "/chunks/settings-password.0188e6bd0c54da3e5622.hot-update.js",
-    "/chunks/settings.785b8b09d065036f22c3.hot-update.js": "/chunks/settings.785b8b09d065036f22c3.hot-update.js"
+    "/chunks/settings.785b8b09d065036f22c3.hot-update.js": "/chunks/settings.785b8b09d065036f22c3.hot-update.js",
+    "/chunks/settings.cd58b80e4d16e8317220.hot-update.js": "/chunks/settings.cd58b80e4d16e8317220.hot-update.js",
+    "/chunks/settings-password.cd58b80e4d16e8317220.hot-update.js": "/chunks/settings-password.cd58b80e4d16e8317220.hot-update.js"
 }
diff --git a/resources/js/components/Others/CreatePersonaTokenPopup.vue b/resources/js/components/Others/CreatePersonaTokenPopup.vue
index 9bee24b1..27555437 100644
--- a/resources/js/components/Others/CreatePersonaTokenPopup.vue
+++ b/resources/js/components/Others/CreatePersonaTokenPopup.vue
@@ -1,13 +1,13 @@
 <template>
     <PopupWrapper name="create-personal-token">
 
-        <PopupHeader :title="$t('Create Personal Token')" icon="key" />
+        <PopupHeader :title="$t('popup_personal_token.title')" icon="key" />
 
         <PopupContent>
              <ValidationObserver v-if="! token" @submit.prevent="createTokenForm" ref="createToken" v-slot="{ invalid }" tag="form" class="form-wrapper">
                 <ValidationProvider tag="div" mode="passive" class="input-wrapper password" name="Token Name" rules="required" v-slot="{ errors }">
-                    <label class="input-label"> {{ $t('Token Name') }}:</label>
-                    <input v-model="name" :class="{'is-error': errors[0]}" type="text" ref="input" class="focus-border-theme" :placeholder="$t('Type token name...')">
+                    <label class="input-label"> {{ $t('popup_personal_token.label') }}:</label>
+                    <input v-model="name" :class="{'is-error': errors[0]}" type="text" ref="input" class="focus-border-theme" :placeholder="$t('popup_personal_token.plc')">
                     <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                 </ValidationProvider>
             </ValidationObserver>
@@ -15,12 +15,12 @@
             <div v-if="token" class="form-wrapper">
 				<div v-if="token">
 					<div class="input-wrapper">
-						<label class="input-label">{{ $t('Your Personal Access Token') }}:</label>
+						<label class="input-label">{{ $t('popup_personal_token.your_token') }}:</label>
 						<CopyInput size="small" :str="token['plainTextToken']" />
 					</div>
 				</div>
 				<InfoBox style="margin-bottom: 0; margin-top: 20px">
-                	<p v-html="$t('Make sure to <b class=\'text-theme\'>copy your personal access token now</b>. You won’t be able to see it again!')"></p>
+                	<p v-html="$t('popup_personal_token.copy_token')"></p>
             	</InfoBox>
             </div>
         </PopupContent>
@@ -40,7 +40,7 @@
 				:loading="isLoading"
 				:disabled="isLoading"
 			>
-               {{ $t('Create Token') }}
+               {{ $t('personal_token.create_token') }}
             </ButtonBase>
         </PopupActions>
 
diff --git a/resources/js/views/User/Password.vue b/resources/js/views/User/Password.vue
index 96a89556..2331ca8c 100644
--- a/resources/js/views/User/Password.vue
+++ b/resources/js/views/User/Password.vue
@@ -73,9 +73,9 @@
 			</div>
         </PageTabGroup>
 		<PageTabGroup class="form block-form">
-            <FormLabel icon="key">{{ $t('Personal Access Token') }}</FormLabel>
+            <FormLabel icon="key">{{ $t('personal_token.section_title') }}</FormLabel>
 			<InfoBox v-if="tokens.length === 0">
-				<p>{{ $t("You don't have any created personal access tokens yet.") }}</p>
+				<p>{{ $t("personal_token.section_description") }}</p>
 			</InfoBox>
 
 			<InfoBox v-if="tokens.length > 0">
@@ -83,7 +83,7 @@
 					<li class="token-item" v-for="token in tokens" :key="token.id">
 						<div class="tokens-details">
 							<b class="name">{{ token.name}}</b>
-							<time class="last-used">{{ $t('Last Used') }}: {{ token.last_used_at ? formatDate(token.last_used_at) : $t('Never') }}</time>
+							<time class="last-used">{{ $t('last_used') }}: {{ token.last_used_at ? formatDate(token.last_used_at) : $t('never') }}</time>
 						</div>
 						<div @click="confirmDeleteToken(token)" class="tokens-destroyer">
 							<x-icon size="16" class="close-icon hover-text-theme" />
@@ -93,7 +93,7 @@
 			</InfoBox>
 
 			<ButtonBase @click.native="openCreateTokenPopup" type="submit" button-style="theme" class="confirm-form">
-				{{ $t('Create Token') }}
+				{{ $t('personal_token.create_token') }}
 			</ButtonBase>
         </PageTabGroup>
     </PageTab>
@@ -152,8 +152,8 @@
 			},
 			confirmDeleteToken(token) {
 				events.$emit('confirm:open', {
-					title: this.$t('Are you sure you want to delete this token?'),
-					message: this.$t('Any applications or scripts using this token will no longer be able to access into your account. You cannot undo this action.'),
+					title: this.$t('popup_delete_personal_token.title'),
+					message: this.$t('popup_delete_personal_token.description'),
 					action: {
 						id: token.id,
 						operation: 'delete-personal-access-token'
@@ -168,7 +168,7 @@
 
 						events.$emit('toaster', {
 							type: 'success',
-							message: this.$t('Token was successfully deleted!'),
+							message: this.$t('personal_token.token_deleted'),
 						})
 					})
 					.catch(() => this.$isSomethingWrong())