diff --git a/components/user-dropdown.vue b/components/user-dropdown.vue
index 8b1e55f..87c0f62 100644
--- a/components/user-dropdown.vue
+++ b/components/user-dropdown.vue
@@ -11,20 +11,26 @@
       </Button>
     </DropdownMenuTrigger>
     <DropdownMenuContent class="w-48" align="end" side="top">
+      <DropdownMenuItem @select="handleChangePassword">
+        <Icon name="ri:lock-password-line" class="h-4 w-4" />
+        <span>{{ t('Change Password') }}</span>
+      </DropdownMenuItem>
       <DropdownMenuItem @select="handleLogout">
         <Icon name="ri:logout-box-r-line" class="h-4 w-4" />
         <span>{{ t('Logout') }}</span>
       </DropdownMenuItem>
     </DropdownMenuContent>
   </DropdownMenu>
+  <AccessKeysChangePassword v-model:visible="changePasswordVisible" />
 </template>
 
 <script lang="ts" setup>
 import { Icon } from '#components'
 import { Button } from '@/components/ui/button'
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@/components/ui/dropdown-menu'
-import { defineProps, toRef, withDefaults } from 'vue'
+import { defineProps, ref, toRef, withDefaults } from 'vue'
 import { useI18n } from 'vue-i18n'
+import AccessKeysChangePassword from '@/components/access-keys/change-password.vue'
 
 const { t } = useI18n()
 const { logout } = useAuth()
@@ -40,6 +46,11 @@ const props = withDefaults(
 )
 
 const isCollapsed = toRef(props, 'isCollapsed')
+const changePasswordVisible = ref(false)
+
+const handleChangePassword = () => {
+  changePasswordVisible.value = true
+}
 
 const handleLogout = async () => {
   await logout()
diff --git a/pages/access-keys/index.vue b/pages/access-keys/index.vue
index 2f70902..824b722 100644
--- a/pages/access-keys/index.vue
+++ b/pages/access-keys/index.vue
@@ -4,10 +4,10 @@
       <h1 class="text-2xl font-bold">{{ t('Access Keys') }}</h1>
       <template #actions>
         <SearchInput v-model="searchTerm" :placeholder="t('Search Access Key')" clearable class="max-w-xs" />
-        <Button variant="outline" @click="changePasswordVisible = true">
+        <!-- <Button variant="outline" @click="changePasswordVisible = true">
           <Icon name="ri:key-2-line" class="size-4" />
           <span>{{ t('Change Password') }}</span>
-        </Button>
+        </Button> -->
         <Button variant="outline" v-if="selectedKeys.length" :disabled="!selectedKeys.length" @click="deleteSelected">
           <Icon name="ri:delete-bin-5-line" class="size-4" />
           <span>{{ t('Delete Selected') }}</span>