diff --git a/app/Http/Controllers/V1/Admin/Settings/CompanyController.php b/app/Http/Controllers/V1/Admin/Settings/CompanyController.php
index 5bc05160..5be1269e 100644
--- a/app/Http/Controllers/V1/Admin/Settings/CompanyController.php
+++ b/app/Http/Controllers/V1/Admin/Settings/CompanyController.php
@@ -3,48 +3,13 @@
 namespace App\Http\Controllers\V1\Admin\Settings;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\AvatarRequest;
 use App\Http\Requests\CompanyLogoRequest;
 use App\Http\Requests\CompanyRequest;
-use App\Http\Requests\ProfileRequest;
 use App\Http\Resources\CompanyResource;
-use App\Http\Resources\UserResource;
 use App\Models\Company;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 
 class CompanyController extends Controller
 {
-    /**
-     * Retrive the Admin account.
-     *
-     * @return JsonResponse
-     */
-    public function getUser(Request $request)
-    {
-        return new UserResource($request->user());
-    }
-
-    /**
-     * Update the Admin profile.
-     * Includes name, email and (or) password
-     *
-     * @return JsonResponse
-     */
-    public function updateProfile(ProfileRequest $request)
-    {
-        $user = $request->user();
-
-        $user->update($request->validated());
-
-        return new UserResource($user);
-    }
-
-    /**
-     * Update Admin Company Details
-     *
-     * @return JsonResponse
-     */
     public function updateCompany(CompanyRequest $request)
     {
         $company = Company::find($request->header('company'));
@@ -58,11 +23,6 @@ class CompanyController extends Controller
         return new CompanyResource($company);
     }
 
-    /**
-     * Upload the company logo to storage.
-     *
-     * @return JsonResponse
-     */
     public function uploadCompanyLogo(CompanyLogoRequest $request)
     {
         $company = Company::find($request->header('company'));
@@ -90,35 +50,4 @@ class CompanyController extends Controller
             'success' => true,
         ]);
     }
-
-    /**
-     * Upload the Admin Avatar to public storage.
-     *
-     * @return JsonResponse
-     */
-    public function uploadAvatar(AvatarRequest $request)
-    {
-        $user = auth()->user();
-
-        if (isset($request->is_admin_avatar_removed) && (bool) $request->is_admin_avatar_removed) {
-            $user->clearMediaCollection('admin_avatar');
-        }
-        if ($user && $request->hasFile('admin_avatar')) {
-            $user->clearMediaCollection('admin_avatar');
-
-            $user->addMediaFromRequest('admin_avatar')
-                ->toMediaCollection('admin_avatar');
-        }
-
-        if ($user && $request->has('avatar')) {
-            $data = json_decode($request->avatar);
-            $user->clearMediaCollection('admin_avatar');
-
-            $user->addMediaFromBase64($data->data)
-                ->usingFileName($data->name)
-                ->toMediaCollection('admin_avatar');
-        }
-
-        return new UserResource($user);
-    }
 }
diff --git a/app/Http/Controllers/V1/Admin/Settings/UserProfileController.php b/app/Http/Controllers/V1/Admin/Settings/UserProfileController.php
new file mode 100644
index 00000000..a5329963
--- /dev/null
+++ b/app/Http/Controllers/V1/Admin/Settings/UserProfileController.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Http\Controllers\V1\Admin\Settings;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\AvatarRequest;
+use App\Http\Requests\ProfileRequest;
+use App\Http\Resources\UserResource;
+use Illuminate\Http\Request;
+
+class UserProfileController extends Controller
+{
+    public function show(Request $request)
+    {
+        return new UserResource($request->user());
+    }
+
+    public function update(ProfileRequest $request)
+    {
+        $user = $request->user();
+
+        $user->update($request->validated());
+
+        return new UserResource($user);
+    }
+
+    public function uploadAvatar(AvatarRequest $request)
+    {
+        $user = auth()->user();
+
+        if (isset($request->is_admin_avatar_removed) && (bool) $request->is_admin_avatar_removed) {
+            $user->clearMediaCollection('admin_avatar');
+        }
+        if ($user && $request->hasFile('admin_avatar')) {
+            $user->clearMediaCollection('admin_avatar');
+
+            $user->addMediaFromRequest('admin_avatar')
+                ->toMediaCollection('admin_avatar');
+        }
+
+        if ($user && $request->has('avatar')) {
+            $data = json_decode($request->avatar);
+            $user->clearMediaCollection('admin_avatar');
+
+            $user->addMediaFromBase64($data->data)
+                ->usingFileName($data->name)
+                ->toMediaCollection('admin_avatar');
+        }
+
+        return new UserResource($user);
+    }
+}
diff --git a/config/invoiceshelf.php b/config/invoiceshelf.php
index 74148ac4..4fc2e7b5 100644
--- a/config/invoiceshelf.php
+++ b/config/invoiceshelf.php
@@ -130,16 +130,6 @@ return [
     * List of setting menu
     */
     'setting_menu' => [
-        [
-            'title' => 'settings.menu_title.account_settings',
-            'group' => '',
-            'name' => 'Account Settings',
-            'link' => '/admin/settings/account-settings',
-            'icon' => 'UserIcon',
-            'owner_only' => false,
-            'ability' => '',
-            'model' => '',
-        ],
         [
             'title' => 'settings.menu_title.company_information',
             'group' => '',
diff --git a/lang/en.json b/lang/en.json
index 168a94fb..93991e99 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1133,12 +1133,14 @@
       }
     },
     "account_settings": {
-      "profile_picture": "Profile Picture",
+      "profile_picture": "Profile Photo",
       "name": "Name",
       "email": "Email",
       "password": "Password",
       "confirm_password": "Confirm Password",
-      "account_settings": "Account Settings",
+      "account_settings": "User Settings",
+      "general": "General",
+      "security": "Security",
       "save": "Save",
       "section_description": "You can update your name, email & password using the form below.",
       "updated_message": "Account Settings updated successfully"
diff --git a/resources/scripts/admin/admin-router.js b/resources/scripts/admin/admin-router.js
index 3f18fa2b..20d73670 100644
--- a/resources/scripts/admin/admin-router.js
+++ b/resources/scripts/admin/admin-router.js
@@ -23,8 +23,8 @@ const CustomerView = () => import('@/scripts/admin/views/customers/View.vue')
 //Settings
 const SettingsIndex = () =>
   import('@/scripts/admin/views/settings/SettingsIndex.vue')
-const AccountSetting = () =>
-  import('@/scripts/admin/views/settings/AccountSetting.vue')
+const UserSettingsIndex = () =>
+  import('@/scripts/admin/views/user-settings/UserSettingsIndex.vue')
 const CompanyInfo = () =>
   import('@/scripts/admin/views/settings/CompanyInfoSettings.vue')
 const Preferences = () =>
@@ -243,17 +243,19 @@ export default [
         component: PaymentView,
       },
 
+      // user settings
+      {
+        path: 'user-settings',
+        name: 'user.settings',
+        component: UserSettingsIndex,
+      },
+
       //settings
       {
         path: 'settings',
         name: 'settings',
         component: SettingsIndex,
         children: [
-          {
-            path: 'account-settings',
-            name: 'account.settings',
-            component: AccountSetting,
-          },
           {
             path: 'company-info',
             name: 'company.info',
diff --git a/resources/scripts/admin/layouts/partials/TheSiteHeader.vue b/resources/scripts/admin/layouts/partials/TheSiteHeader.vue
index 3db6081c..640e5ff4 100644
--- a/resources/scripts/admin/layouts/partials/TheSiteHeader.vue
+++ b/resources/scripts/admin/layouts/partials/TheSiteHeader.vue
@@ -147,7 +147,7 @@
             />
           </template>
 
-          <router-link to="/admin/settings/account-settings">
+          <router-link to="/admin/user-settings">
             <BaseDropdownItem>
               <BaseIcon
                 name="CogIcon"
diff --git a/resources/scripts/admin/views/settings/AccountSetting.vue b/resources/scripts/admin/views/settings/AccountSetting.vue
deleted file mode 100644
index 6c8fe5c5..00000000
--- a/resources/scripts/admin/views/settings/AccountSetting.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <form class="relative" @submit.prevent="updateUserData">
-    <BaseSettingCard
-      :title="$t('settings.account_settings.account_settings')"
-      :description="$t('settings.account_settings.section_description')"
-    >
-      <BaseInputGrid>
-        <BaseInputGroup
-          :label="$t('settings.account_settings.profile_picture')"
-        >
-          <BaseFileUploader
-            v-model="imgFiles"
-            :avatar="true"
-            accept="image/*"
-            @change="onFileInputChange"
-            @remove="onFileInputRemove"
-          />
-        </BaseInputGroup>
-
-        <!-- Empty Column -->
-        <span></span>
-
-        <BaseInputGroup
-          :label="$t('settings.account_settings.name')"
-          :error="v$.name.$error && v$.name.$errors[0].$message"
-          required
-        >
-          <BaseInput
-            v-model="userForm.name"
-            :invalid="v$.name.$error"
-            @input="v$.name.$touch()"
-          />
-        </BaseInputGroup>
-
-        <BaseInputGroup
-          :label="$t('settings.account_settings.email')"
-          :error="v$.email.$error && v$.email.$errors[0].$message"
-          required
-        >
-          <BaseInput
-            v-model="userForm.email"
-            :invalid="v$.email.$error"
-            @input="v$.email.$touch()"
-          />
-        </BaseInputGroup>
-
-        <BaseInputGroup
-          :error="v$.password.$error && v$.password.$errors[0].$message"
-          :label="$t('settings.account_settings.password')"
-        >
-          <BaseInput
-            v-model="userForm.password"
-            type="password"
-            @input="v$.password.$touch()"
-          />
-        </BaseInputGroup>
-
-        <BaseInputGroup
-          :label="$t('settings.account_settings.confirm_password')"
-          :error="
-            v$.confirm_password.$error &&
-            v$.confirm_password.$errors[0].$message
-          "
-        >
-          <BaseInput
-            v-model="userForm.confirm_password"
-            type="password"
-            @input="v$.confirm_password.$touch()"
-          />
-        </BaseInputGroup>
-
-        <BaseInputGroup :label="$t('settings.language')">
-          <BaseMultiselect
-            v-model="userForm.language"
-            :options="globalStore.config.languages"
-            label="name"
-            value-prop="code"
-            track-by="name"
-            :searchable="true"
-            open-direction="top"
-          />
-        </BaseInputGroup>
-      </BaseInputGrid>
-
-      <BaseButton :loading="isSaving" :disabled="isSaving" class="mt-6">
-        <template #left="slotProps">
-          <BaseIcon
-            v-if="!isSaving"
-            name="ArrowDownOnSquareIcon"
-            :class="slotProps.class"
-          ></BaseIcon>
-        </template>
-        {{ $t('settings.company_info.save') }}
-      </BaseButton>
-    </BaseSettingCard>
-  </form>
-</template>
-
-<script setup>
-import { ref, computed, reactive } from 'vue'
-import { useGlobalStore } from '@/scripts/admin/stores/global'
-import { useUserStore } from '@/scripts/admin/stores/user'
-import { useI18n } from 'vue-i18n'
-import {
-  helpers,
-  sameAs,
-  email,
-  required,
-  minLength,
-} from '@vuelidate/validators'
-import { useVuelidate } from '@vuelidate/core'
-import { useCompanyStore } from '@/scripts/admin/stores/company'
-
-const userStore = useUserStore()
-const globalStore = useGlobalStore()
-const companyStore = useCompanyStore()
-const { t } = useI18n()
-
-let isSaving = ref(false)
-let avatarFileBlob = ref(null)
-let imgFiles = ref([])
-const isAdminAvatarRemoved = ref(false)
-
-if (userStore.currentUser.avatar) {
-  imgFiles.value.push({
-    image: userStore.currentUser.avatar,
-  })
-}
-
-const rules = computed(() => {
-  return {
-    name: {
-      required: helpers.withMessage(t('validation.required'), required),
-    },
-    email: {
-      required: helpers.withMessage(t('validation.required'), required),
-      email: helpers.withMessage(t('validation.email_incorrect'), email),
-    },
-    password: {
-      minLength: helpers.withMessage(
-        t('validation.password_length', { count: 8 }),
-        minLength(8)
-      ),
-    },
-    confirm_password: {
-      sameAsPassword: helpers.withMessage(
-        t('validation.password_incorrect'),
-        sameAs(userForm.password)
-      ),
-    },
-  }
-})
-
-const userForm = reactive({
-  name: userStore.currentUser.name,
-  email: userStore.currentUser.email,
-  language:
-    userStore.currentUserSettings.language ||
-    companyStore.selectedCompanySettings.language,
-  password: '',
-  confirm_password: '',
-})
-
-const v$ = useVuelidate(
-  rules,
-  computed(() => userForm)
-)
-
-function onFileInputChange(fileName, file) {
-  avatarFileBlob.value = file
-}
-
-function onFileInputRemove() {
-  avatarFileBlob.value = null
-  isAdminAvatarRemoved.value = true
-}
-
-async function updateUserData() {
-  v$.value.$touch()
-
-  if (v$.value.$invalid) {
-    return true
-  }
-
-  isSaving.value = true
-
-  let data = {
-    name: userForm.name,
-    email: userForm.email,
-  }
-
-  try {
-    if (
-      userForm.password != null &&
-      userForm.password !== undefined &&
-      userForm.password !== ''
-    ) {
-      data = { ...data, password: userForm.password }
-    }
-    // Update Language if changed
-
-    if (userStore.currentUserSettings.language !== userForm.language) {
-      // Load the new language dynamically before updating settings
-      await window.loadLanguage(userForm.language)
-
-      await userStore.updateUserSettings({
-        settings: {
-          language: userForm.language,
-        },
-      })
-    }
-
-    let response = await userStore.updateCurrentUser(data)
-
-    if (response.data.data) {
-      isSaving.value = false
-
-      if (avatarFileBlob.value || isAdminAvatarRemoved.value) {
-        let avatarData = new FormData()
-
-        if (avatarFileBlob.value) {
-          avatarData.append('admin_avatar', avatarFileBlob.value)
-        }
-        avatarData.append('is_admin_avatar_removed', isAdminAvatarRemoved.value)
-
-        await userStore.uploadAvatar(avatarData)
-        avatarFileBlob.value = null
-        isAdminAvatarRemoved.value = false
-      }
-
-      userForm.password = ''
-      userForm.confirm_password = ''
-    }
-  } catch (error) {
-    isSaving.value = false
-    return true
-  }
-}
-</script>
diff --git a/resources/scripts/admin/views/settings/SettingsIndex.vue b/resources/scripts/admin/views/settings/SettingsIndex.vue
index 2ccd3496..42728de7 100644
--- a/resources/scripts/admin/views/settings/SettingsIndex.vue
+++ b/resources/scripts/admin/views/settings/SettingsIndex.vue
@@ -5,7 +5,7 @@
         <BaseBreadcrumbItem :title="$t('general.home')" to="/admin/dashboard" />
         <BaseBreadcrumbItem
           :title="$t('settings.setting', 2)"
-          to="/admin/settings/account-settings"
+          to="/admin/settings/company-info"
           active
         />
       </BaseBreadcrumb>
@@ -75,7 +75,7 @@ const dropdownMenuItems = computed(() => {
 
 watchEffect(() => {
   if (route.path === '/admin/settings') {
-    router.push('/admin/settings/account-settings')
+    router.push('/admin/settings/company-info')
   }
 
   const item = dropdownMenuItems.value.find((item) => {
diff --git a/resources/scripts/admin/views/user-settings/GeneralTab.vue b/resources/scripts/admin/views/user-settings/GeneralTab.vue
new file mode 100644
index 00000000..24d3e6e0
--- /dev/null
+++ b/resources/scripts/admin/views/user-settings/GeneralTab.vue
@@ -0,0 +1,121 @@
+<template>
+  <form @submit.prevent="updateGeneral">
+    <BaseInputGrid>
+      <BaseInputGroup
+        :label="$t('settings.account_settings.name')"
+        :error="v$.name.$error && v$.name.$errors[0].$message"
+        required
+      >
+        <BaseInput
+          v-model="form.name"
+          :invalid="v$.name.$error"
+          @input="v$.name.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.account_settings.email')"
+        :error="v$.email.$error && v$.email.$errors[0].$message"
+        required
+      >
+        <BaseInput
+          v-model="form.email"
+          :invalid="v$.email.$error"
+          @input="v$.email.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup :label="$t('settings.language')">
+        <BaseMultiselect
+          v-model="form.language"
+          :options="globalStore.config.languages"
+          label="name"
+          value-prop="code"
+          track-by="name"
+          :searchable="true"
+          open-direction="top"
+        />
+      </BaseInputGroup>
+    </BaseInputGrid>
+
+    <BaseButton :loading="isSaving" :disabled="isSaving" class="mt-6">
+      <template #left="slotProps">
+        <BaseIcon
+          v-if="!isSaving"
+          name="ArrowDownOnSquareIcon"
+          :class="slotProps.class"
+        />
+      </template>
+      {{ $t('settings.company_info.save') }}
+    </BaseButton>
+  </form>
+</template>
+
+<script setup>
+import { ref, computed, reactive } from 'vue'
+import { useGlobalStore } from '@/scripts/admin/stores/global'
+import { useUserStore } from '@/scripts/admin/stores/user'
+import { useCompanyStore } from '@/scripts/admin/stores/company'
+import { useI18n } from 'vue-i18n'
+import { helpers, email, required } from '@vuelidate/validators'
+import { useVuelidate } from '@vuelidate/core'
+
+const userStore = useUserStore()
+const globalStore = useGlobalStore()
+const companyStore = useCompanyStore()
+const { t } = useI18n()
+
+const isSaving = ref(false)
+
+const form = reactive({
+  name: userStore.currentUser.name,
+  email: userStore.currentUser.email,
+  language:
+    userStore.currentUserSettings.language ||
+    companyStore.selectedCompanySettings.language,
+})
+
+const rules = computed(() => ({
+  name: {
+    required: helpers.withMessage(t('validation.required'), required),
+  },
+  email: {
+    required: helpers.withMessage(t('validation.required'), required),
+    email: helpers.withMessage(t('validation.email_incorrect'), email),
+  },
+}))
+
+const v$ = useVuelidate(
+  rules,
+  computed(() => form)
+)
+
+async function updateGeneral() {
+  v$.value.$touch()
+
+  if (v$.value.$invalid) {
+    return
+  }
+
+  isSaving.value = true
+
+  try {
+    if (userStore.currentUserSettings.language !== form.language) {
+      await window.loadLanguage(form.language)
+
+      await userStore.updateUserSettings({
+        settings: {
+          language: form.language,
+        },
+      })
+    }
+
+    await userStore.updateCurrentUser({
+      name: form.name,
+      email: form.email,
+    })
+  } finally {
+    isSaving.value = false
+  }
+}
+</script>
diff --git a/resources/scripts/admin/views/user-settings/ProfilePhotoTab.vue b/resources/scripts/admin/views/user-settings/ProfilePhotoTab.vue
new file mode 100644
index 00000000..c30c3526
--- /dev/null
+++ b/resources/scripts/admin/views/user-settings/ProfilePhotoTab.vue
@@ -0,0 +1,78 @@
+<template>
+  <form @submit.prevent="updateAvatar">
+    <BaseInputGrid>
+      <BaseInputGroup
+        :label="$t('settings.account_settings.profile_picture')"
+      >
+        <BaseFileUploader
+          v-model="imgFiles"
+          :avatar="true"
+          accept="image/*"
+          @change="onFileInputChange"
+          @remove="onFileInputRemove"
+        />
+      </BaseInputGroup>
+    </BaseInputGrid>
+
+    <BaseButton :loading="isSaving" :disabled="isSaving" class="mt-6">
+      <template #left="slotProps">
+        <BaseIcon
+          v-if="!isSaving"
+          name="ArrowDownOnSquareIcon"
+          :class="slotProps.class"
+        />
+      </template>
+      {{ $t('settings.company_info.save') }}
+    </BaseButton>
+  </form>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { useUserStore } from '@/scripts/admin/stores/user'
+
+const userStore = useUserStore()
+
+const isSaving = ref(false)
+let avatarFileBlob = ref(null)
+let imgFiles = ref([])
+const isAdminAvatarRemoved = ref(false)
+
+if (userStore.currentUser.avatar) {
+  imgFiles.value.push({
+    image: userStore.currentUser.avatar,
+  })
+}
+
+function onFileInputChange(fileName, file) {
+  avatarFileBlob.value = file
+}
+
+function onFileInputRemove() {
+  avatarFileBlob.value = null
+  isAdminAvatarRemoved.value = true
+}
+
+async function updateAvatar() {
+  if (!avatarFileBlob.value && !isAdminAvatarRemoved.value) {
+    return
+  }
+
+  isSaving.value = true
+
+  try {
+    let data = new FormData()
+
+    if (avatarFileBlob.value) {
+      data.append('admin_avatar', avatarFileBlob.value)
+    }
+    data.append('is_admin_avatar_removed', isAdminAvatarRemoved.value)
+
+    await userStore.uploadAvatar(data)
+    avatarFileBlob.value = null
+    isAdminAvatarRemoved.value = false
+  } finally {
+    isSaving.value = false
+  }
+}
+</script>
diff --git a/resources/scripts/admin/views/user-settings/SecurityTab.vue b/resources/scripts/admin/views/user-settings/SecurityTab.vue
new file mode 100644
index 00000000..cffa139b
--- /dev/null
+++ b/resources/scripts/admin/views/user-settings/SecurityTab.vue
@@ -0,0 +1,105 @@
+<template>
+  <form @submit.prevent="updatePassword">
+    <BaseInputGrid>
+      <BaseInputGroup
+        :label="$t('settings.account_settings.password')"
+        :error="v$.password.$error && v$.password.$errors[0].$message"
+      >
+        <BaseInput
+          v-model="form.password"
+          type="password"
+          @input="v$.password.$touch()"
+        />
+      </BaseInputGroup>
+
+      <BaseInputGroup
+        :label="$t('settings.account_settings.confirm_password')"
+        :error="
+          v$.confirm_password.$error &&
+          v$.confirm_password.$errors[0].$message
+        "
+      >
+        <BaseInput
+          v-model="form.confirm_password"
+          type="password"
+          @input="v$.confirm_password.$touch()"
+        />
+      </BaseInputGroup>
+    </BaseInputGrid>
+
+    <BaseButton :loading="isSaving" :disabled="isSaving" class="mt-6">
+      <template #left="slotProps">
+        <BaseIcon
+          v-if="!isSaving"
+          name="ArrowDownOnSquareIcon"
+          :class="slotProps.class"
+        />
+      </template>
+      {{ $t('settings.company_info.save') }}
+    </BaseButton>
+  </form>
+</template>
+
+<script setup>
+import { ref, computed, reactive } from 'vue'
+import { useUserStore } from '@/scripts/admin/stores/user'
+import { useI18n } from 'vue-i18n'
+import { helpers, sameAs, minLength } from '@vuelidate/validators'
+import { useVuelidate } from '@vuelidate/core'
+
+const userStore = useUserStore()
+const { t } = useI18n()
+
+const isSaving = ref(false)
+
+const form = reactive({
+  password: '',
+  confirm_password: '',
+})
+
+const rules = computed(() => ({
+  password: {
+    minLength: helpers.withMessage(
+      t('validation.password_length', { count: 8 }),
+      minLength(8)
+    ),
+  },
+  confirm_password: {
+    sameAsPassword: helpers.withMessage(
+      t('validation.password_incorrect'),
+      sameAs(form.password)
+    ),
+  },
+}))
+
+const v$ = useVuelidate(
+  rules,
+  computed(() => form)
+)
+
+async function updatePassword() {
+  v$.value.$touch()
+
+  if (v$.value.$invalid) {
+    return
+  }
+
+  if (!form.password) {
+    return
+  }
+
+  isSaving.value = true
+
+  try {
+    await userStore.updateCurrentUser({
+      password: form.password,
+    })
+
+    form.password = ''
+    form.confirm_password = ''
+    v$.value.$reset()
+  } finally {
+    isSaving.value = false
+  }
+}
+</script>
diff --git a/resources/scripts/admin/views/user-settings/UserSettingsIndex.vue b/resources/scripts/admin/views/user-settings/UserSettingsIndex.vue
new file mode 100644
index 00000000..71490947
--- /dev/null
+++ b/resources/scripts/admin/views/user-settings/UserSettingsIndex.vue
@@ -0,0 +1,47 @@
+<template>
+  <BasePage>
+    <BasePageHeader :title="$t('settings.account_settings.account_settings')">
+      <template #actions>
+        <router-link to="/admin/settings">
+          <BaseButton variant="primary-outline">
+            <template #left="slotProps">
+              <BaseIcon name="CogIcon" :class="slotProps.class" />
+            </template>
+            {{ $t('navigation.settings') }}
+          </BaseButton>
+        </router-link>
+      </template>
+    </BasePageHeader>
+
+    <BaseCard container-class="px-4 py-5 sm:px-8 sm:py-2">
+      <BaseTabGroup>
+        <BaseTab
+          tab-panel-container="py-4 mt-px"
+          :title="$t('settings.account_settings.general')"
+        >
+          <GeneralTab />
+        </BaseTab>
+
+        <BaseTab
+          tab-panel-container="py-4 mt-px"
+          :title="$t('settings.account_settings.profile_picture')"
+        >
+          <ProfilePhotoTab />
+        </BaseTab>
+
+        <BaseTab
+          tab-panel-container="py-4 mt-px"
+          :title="$t('settings.account_settings.security')"
+        >
+          <SecurityTab />
+        </BaseTab>
+      </BaseTabGroup>
+    </BaseCard>
+  </BasePage>
+</template>
+
+<script setup>
+import GeneralTab from './GeneralTab.vue'
+import ProfilePhotoTab from './ProfilePhotoTab.vue'
+import SecurityTab from './SecurityTab.vue'
+</script>
diff --git a/routes/api.php b/routes/api.php
index 9b25b9ab..7b783fe3 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -61,6 +61,7 @@ use App\Http\Controllers\V1\Admin\Settings\CompanyCurrencyCheckTransactionsContr
 use App\Http\Controllers\V1\Admin\Settings\CompanyMailConfigurationController;
 use App\Http\Controllers\V1\Admin\Settings\CompanySettingsController;
 use App\Http\Controllers\V1\Admin\Settings\TaxTypesController;
+use App\Http\Controllers\V1\Admin\Settings\UserProfileController;
 use App\Http\Controllers\V1\Admin\Settings\UserSettingsController;
 use App\Http\Controllers\V1\Admin\Users\UsersController;
 use App\Http\Controllers\V1\Customer\Auth\ForgotPasswordController as AuthForgotPasswordController;
@@ -378,15 +379,15 @@ Route::prefix('/v1')->group(function () {
             // Settings
             // ----------------------------------
 
-            Route::get('/me', [CompanyController::class, 'getUser']);
+            Route::get('/me', [UserProfileController::class, 'show']);
 
-            Route::put('/me', [CompanyController::class, 'updateProfile']);
+            Route::put('/me', [UserProfileController::class, 'update']);
 
             Route::get('/me/settings', [UserSettingsController::class, 'show']);
 
             Route::put('/me/settings', [UserSettingsController::class, 'update']);
 
-            Route::post('/me/upload-avatar', [CompanyController::class, 'uploadAvatar']);
+            Route::post('/me/upload-avatar', [UserProfileController::class, 'uploadAvatar']);
 
             Route::put('/company', [CompanyController::class, 'updateCompany']);
 
diff --git a/tests/Feature/Admin/CompanySettingTest.php b/tests/Feature/Admin/CompanySettingTest.php
index d6f03199..1f1c95a4 100644
--- a/tests/Feature/Admin/CompanySettingTest.php
+++ b/tests/Feature/Admin/CompanySettingTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Http\Controllers\V1\Admin\Settings\CompanyController;
+use App\Http\Controllers\V1\Admin\Settings\UserProfileController;
 use App\Http\Requests\CompanyRequest;
 use App\Http\Requests\ProfileRequest;
 use App\Models\Invoice;
@@ -35,8 +36,8 @@ test('get profile', function () {
 
 test('update profile using a form request', function () {
     $this->assertActionUsesFormRequest(
-        CompanyController::class,
-        'updateProfile',
+        UserProfileController::class,
+        'update',
         ProfileRequest::class
     );
 });