diff --git a/frontend_management/Dockerfile b/frontend_management/Dockerfile
index b2d3a831..67b09c92 100644
--- a/frontend_management/Dockerfile
+++ b/frontend_management/Dockerfile
@@ -45,4 +45,4 @@ ENV NUXT_HOST=0.0.0.0
 ENV NUXT_PORT=3001
 
 # Start the application using preview command
-CMD ["npm", "run", "preview"]
+CMD ["node", ".output/server/index.mjs"]
diff --git a/frontend_management/pages/admin/users/index.vue b/frontend_management/pages/admin/users/index.vue
index 8a57af14..edb9acde 100644
--- a/frontend_management/pages/admin/users/index.vue
+++ b/frontend_management/pages/admin/users/index.vue
@@ -217,6 +217,7 @@
 <script setup lang="ts">
 import { useQuasar } from 'quasar';
 import { adminService, type AdminUserResponse } from '~/services/admin.service';
+import { useAuthStore } from '~/stores/auth';
 
 definePageMeta({
   layout: 'admin',
@@ -367,7 +368,19 @@ const changeRole = (user: AdminUserResponse) => {
   });
 };
 
+const authStore = useAuthStore();
+
 const confirmDelete = (user: AdminUserResponse) => {
+  // Prevent deleting own account
+  if (authStore.user && Number(authStore.user.id) === user.id) {
+    $q.notify({
+      type: 'warning',
+      message: 'ไม่สามารถลบบัญชีของตัวเองได้',
+      position: 'top'
+    });
+    return;
+  }
+
   $q.dialog({
     title: 'ยืนยันการลบ',
     message: `คุณต้องการลบผู้ใช้ "${user.profile.first_name} ${user.profile.last_name}" หรือไม่?`,