diff --git a/frontend/src/components/TimeEntry/EntryForm.jsx b/frontend/src/components/TimeEntry/EntryForm.jsx
index f9fd695..0583b37 100644
--- a/frontend/src/components/TimeEntry/EntryForm.jsx
+++ b/frontend/src/components/TimeEntry/EntryForm.jsx
@@ -39,12 +39,22 @@ const EntryForm = ({ onEntryAdded }) => {
         }
     }, [duration, type, dayType, entryMode]);
 
+    // Auto-detect Day Type based on Date
+    useEffect(() => {
+        if (!date) return;
+        // Parse date manually to avoid UTC conversion issues (use local noon)
+        const [y, m, d] = date.split('-').map(Number);
+        const checkDate = new Date(y, m - 1, d, 12, 0, 0);
+        const detected = detectDayType(checkDate);
+        setDayType(detected);
+    }, [date]);
+
     useEffect(() => {
         if (entryMode === 'range' && type === 'standby') {
             const entries = generateStandbyEntries(date, dateEnd);
             let total = 0;
             entries.forEach(e => {
-                const banked = calculateBankedHours(e.duration, e.type, e.dayType); // Should handle 16->2, 24->3 (if formula is correct)
+                const banked = calculateBankedHours(e.duration, e.type, e.dayType);
                 total += banked;
             });
             setBulkPreview({ count: entries.length, totalHours: total });
@@ -228,16 +238,12 @@ const EntryForm = ({ onEntryAdded }) => {
 
                             <div>
                                 <label className="block text-sm font-medium text-gray-700">{t('entry.day_type')}</label>
-                                <select
-                                    className="mt-1 block w-full border border-gray-300 rounded-md shadow-sm p-2"
-                                    value={dayType}
-                                    onChange={e => setDayType(e.target.value)}
-                                >
-                                    <option value="workday">{t('day.workday')}</option>
-                                    <option value="rest_day_1">{t('day.rest_day_1')}</option>
-                                    <option value="rest_day_2">{t('day.rest_day_2')}</option>
-                                    <option value="holiday">{t('day.holiday')}</option>
-                                </select>
+                                <input
+                                    type="text"
+                                    readOnly
+                                    className="mt-1 block w-full border border-gray-300 bg-gray-100 rounded-md shadow-sm p-2 text-gray-600 cursor-not-allowed"
+                                    value={t(`day.${dayType}`)}
+                                />
                             </div>
                         </>
                     )}