diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index 3a156e0d..f97b645d 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -172,6 +172,7 @@ import {
 import { usersStore } from '@/stores/users'
 import { sessionStore } from '@/stores/session'
 import { showSettings, activeSettingsPage } from '@/composables/settings'
+import { showChangePasswordModal } from '@/composables/modals'
 import { FeatherIcon, call } from 'frappe-ui'
 import {
   SignupBanner,
@@ -329,8 +330,7 @@ const steps = reactive([
     completed: false,
     onClick: () => {
       minimize.value = true
-      showSettings.value = true
-      activeSettingsPage.value = 'Profile'
+      showChangePasswordModal.value = true
     },
   },
   {
diff --git a/frontend/src/components/Modals/GlobalModals.vue b/frontend/src/components/Modals/GlobalModals.vue
index 310b3d5d..d4328e6c 100644
--- a/frontend/src/components/Modals/GlobalModals.vue
+++ b/frontend/src/components/Modals/GlobalModals.vue
@@ -16,9 +16,14 @@
     v-model="showAddressModal"
     v-bind="addressProps"
   />
+  <ChangePasswordModal
+    v-if="showChangePasswordModal"
+    v-model="showChangePasswordModal"
+  />
   <AboutModal v-model="showAboutModal" />
 </template>
 <script setup>
+import ChangePasswordModal from '@/components/Modals/ChangePasswordModal.vue'
 import CreateDocumentModal from '@/components/Modals/CreateDocumentModal.vue'
 import QuickEntryModal from '@/components/Modals/QuickEntryModal.vue'
 import AddressModal from '@/components/Modals/AddressModal.vue'
@@ -34,6 +39,7 @@ import {
   quickEntryProps,
   showAddressModal,
   addressProps,
-  showAboutModal
+  showAboutModal,
+  showChangePasswordModal,
 } from '@/composables/modals'
 </script>
diff --git a/frontend/src/components/Settings/ProfileSettings.vue b/frontend/src/components/Settings/ProfileSettings.vue
index c28ae63b..7f19029f 100644
--- a/frontend/src/components/Settings/ProfileSettings.vue
+++ b/frontend/src/components/Settings/ProfileSettings.vue
@@ -66,10 +66,6 @@
           icon-left="lock"
           @click="showChangePasswordModal = true"
         />
-        <ChangePasswordModal
-          v-if="showChangePasswordModal"
-          v-model="showChangePasswordModal"
-        />
       </div>
       <div class="flex flex-col gap-4">
         <div class="flex justify-between gap-4">
@@ -102,9 +98,9 @@
 </template>
 <script setup>
 import CameraIcon from '@/components/Icons/CameraIcon.vue'
-import ChangePasswordModal from '@/components/Modals/ChangePasswordModal.vue'
 import { usersStore } from '@/stores/users'
 import { validateIsImageFile } from '@/utils'
+import { showChangePasswordModal } from '@/composables/modals'
 import {
   Dropdown,
   FileUploader,
@@ -118,8 +114,6 @@ const { getUser, users } = usersStore()
 
 const user = computed(() => getUser() || {})
 
-const showChangePasswordModal = ref(false)
-
 const profile = ref({})
 const error = ref('')
 
diff --git a/frontend/src/composables/modals.js b/frontend/src/composables/modals.js
index 4fb354c7..bb7e3986 100644
--- a/frontend/src/composables/modals.js
+++ b/frontend/src/composables/modals.js
@@ -6,4 +6,6 @@ export const quickEntryProps = ref({});
 export const showAddressModal = ref(false);
 export const addressProps = ref({});
 
-export const showAboutModal = ref(false);
\ No newline at end of file
+export const showAboutModal = ref(false);
+
+export const showChangePasswordModal = ref(false);
\ No newline at end of file