diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 89ffb43..b06d343 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -45,6 +45,17 @@ jobs:
           node-version: 20
           cache: 'pnpm' # Set this to npm, yarn or pnpm.
 
+      - name: setup key (windows only)
+        if: matrix.settings.platform == 'windows-latest'
+        run: |
+          ./setup-key.bat
+
+      - name: setup key (macos and linux only)
+        if: matrix.settings.platform != 'windows-latest'
+        run: |
+          chmod +x ./setup-key.sh
+          ./setup-key.sh
+
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable
         with:
diff --git a/package.json b/package.json
index 88696e5..abe3296 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "libraryroombookingsystem",
   "private": true,
-  "version": "1.0.2",
+  "version": "1.0.3",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 40c60f9..6956f2b 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "LibraryRoomBookingSystem"
-version = "1.0.2"
+version = "1.0.3"
 dependencies = [
  "chrono",
  "dotenvy",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 02d8ee5..c301427 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "LibraryRoomBookingSystem"
-version = "1.0.2"
+version = "1.0.3"
 description = "A Library Room Booking System built with Tauri and Rust"
 authors = ["Lim Shi Song limshisong123@gmail.com"]
 edition = "2021"
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index d5d068d..59bcf79 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,13 +1,13 @@
 {
   "build": {
     "beforeDevCommand": "pnpm dev",
-    "beforeBuildCommand": "pnpm build && setup-key",
+    "beforeBuildCommand": "pnpm build",
     "devPath": "http://localhost:1420",
     "distDir": "../build"
   },
   "package": {
     "productName": "LibraryRoomBookingSystem",
-    "version": "1.0.2"
+    "version": "1.0.3"
   },
   "tauri": {
     "allowlist": {
diff --git a/src/lib/components/forms/BookingForm.svelte b/src/lib/components/forms/BookingForm.svelte
index 4395ce1..33f52fd 100644
--- a/src/lib/components/forms/BookingForm.svelte
+++ b/src/lib/components/forms/BookingForm.svelte
@@ -73,7 +73,7 @@
         let endDateTime = new Date(dateTime);
         endDateTime = GetEndDateTime(endDateTime, room.duration);
         checkOutTime = formatTime(endDateTime);
-        changeDate();
+        if (checkInDate !== checkOutDate && isNotHikmahRoomAndEksplorasiRoom(roomName)) changeDate();
     };
 
     let changeEndTime = () => {
diff --git a/src/lib/components/forms/FeedBackForm.svelte b/src/lib/components/forms/FeedBackForm.svelte
index 1148d87..229fa57 100644
--- a/src/lib/components/forms/FeedBackForm.svelte
+++ b/src/lib/components/forms/FeedBackForm.svelte
@@ -105,7 +105,7 @@
         />
     </FormGroup>
     {#if data.admin_id}
-        <FormGroup floating label="Admin ID">
+        <FormGroup floating label="Reply By">
             <Input type="text" bind:value={data.admin_id} disabled />
         </FormGroup>
     {/if}
diff --git a/src/lib/repos/feedbackRepo.js b/src/lib/repos/feedbackRepo.js
index c641de8..53add01 100644
--- a/src/lib/repos/feedbackRepo.js
+++ b/src/lib/repos/feedbackRepo.js
@@ -23,7 +23,7 @@ export class FeedBackRepo {
                     edit: "/feedback/form?id=" + feedback.id + "&edit=true",
                 };
                 data = {
-                    id: feedback.id,
+                    feedback_id: feedback.id,
                     date: feedback.date,
                     content: feedback.content,
                     status: feedback.status,
@@ -37,7 +37,7 @@ export class FeedBackRepo {
                     reply: "/manage/feedback/form?id=" + feedback.id + "&edit=true",
                 }
                 data = {
-                    id: feedback.id,
+                    feedback_id: feedback.id,
                     user_id: feedback.user_id,
                     date: feedback.date,
                     content: feedback.content,
diff --git a/src/lib/repos/userManageRepo.js b/src/lib/repos/userManageRepo.js
index f9fd60e..57e52be 100644
--- a/src/lib/repos/userManageRepo.js
+++ b/src/lib/repos/userManageRepo.js
@@ -5,6 +5,7 @@ export class userManageRepo {
     constructor(users = []) {
         this.datas = users.map(user => {
             return {
+                user_id: user.id,
                 username: user.username,
                 email: user.email,
                 phone: user.phone,
diff --git a/src/routes/(admin)/manage/feedback/form/+page.svelte b/src/routes/(admin)/manage/feedback/form/+page.svelte
index dbfe1c8..da7e651 100644
--- a/src/routes/(admin)/manage/feedback/form/+page.svelte
+++ b/src/routes/(admin)/manage/feedback/form/+page.svelte
@@ -30,7 +30,7 @@
                   }
                 : {
                       user_id: data.user.username,
-                      admin_id: $user.id,
+                      admin_id: $user.username,
                       date: formatDate(new Date()),
                       status: data.feedback.status,
                   };