diff --git a/lmsege/lms/templates/lms/assignment_detail.html b/lmsege/lms/templates/lms/assignment_detail.html
index 7e52596..9385c98 100644
--- a/lmsege/lms/templates/lms/assignment_detail.html
+++ b/lmsege/lms/templates/lms/assignment_detail.html
@@ -125,52 +125,54 @@
             </div>
         </div>
         <script>
-            let timeLeft = {{ time_left_seconds }};
-            const display = document.getElementById('countdown-display');
-            const form = document.getElementById('assignment-form');
-            
-            function updateTimer() {
-                if (timeLeft <= 0) {
-                    display.textContent = '00:00:00';
-                    display.classList.add('text-red-300');
-                    // Auto submit
-                    if (form) {
-                        // Prevent multiple submissions
-                        form.onsubmit = null;
-                        const btn = form.querySelector('button[type="submit"]');
-                        if (btn) btn.disabled = true;
-                        
-                        // Append a hidden flag
-                        const input = document.createElement('input');
-                        input.type = 'hidden';
-                        input.name = 'auto_submit';
-                        input.value = '1';
-                        form.appendChild(input);
-                        
-                        form.submit();
+            document.addEventListener('DOMContentLoaded', function() {
+                let timeLeft = {{ time_left_seconds }};
+                const display = document.getElementById('countdown-display');
+                const form = document.getElementById('assignment-form');
+                
+                function updateTimer() {
+                    if (timeLeft <= 0) {
+                        display.textContent = '00:00:00';
+                        display.classList.add('text-red-300');
+                        // Auto submit
+                        if (form) {
+                            // Prevent multiple submissions
+                            form.onsubmit = null;
+                            const btn = form.querySelector('button[type="submit"]');
+                            if (btn) btn.disabled = true;
+                            
+                            // Append a hidden flag
+                            const input = document.createElement('input');
+                            input.type = 'hidden';
+                            input.name = 'auto_submit';
+                            input.value = '1';
+                            form.appendChild(input);
+                            
+                            form.submit();
+                        }
+                        return;
                     }
-                    return;
-                }
-                
-                const h = Math.floor(timeLeft / 3600);
-                const m = Math.floor((timeLeft % 3600) / 60);
-                const s = timeLeft % 60;
-                display.textContent = 
-                    (h > 0 ? (h < 10 ? '0' + h : h) + ':' : '') + 
-                    (m < 10 ? '0' + m : m) + ':' + 
-                    (s < 10 ? '0' + s : s);
                     
-                if (timeLeft < 60) {
-                    display.classList.add('text-red-300', 'animate-pulse');
+                    const h = Math.floor(timeLeft / 3600);
+                    const m = Math.floor((timeLeft % 3600) / 60);
+                    const s = timeLeft % 60;
+                    display.textContent = 
+                        (h > 0 ? (h < 10 ? '0' + h : h) + ':' : '') + 
+                        (m < 10 ? '0' + m : m) + ':' + 
+                        (s < 10 ? '0' + s : s);
+                        
+                    if (timeLeft < 60) {
+                        display.classList.add('text-red-300', 'animate-pulse');
+                    }
+                    
+                    timeLeft--;
+                    setTimeout(updateTimer, 1000);
                 }
                 
-                timeLeft--;
-                setTimeout(updateTimer, 1000);
-            }
-            
-            if (timeLeft > 0) {
-                updateTimer();
-            }
+                if (timeLeft > 0) {
+                    updateTimer();
+                }
+            });
         </script>
         {% endif %}
         
diff --git a/lmsege/lms/views.py b/lmsege/lms/views.py
index f14117a..3833ff9 100644
--- a/lmsege/lms/views.py
+++ b/lmsege/lms/views.py
@@ -82,10 +82,15 @@ def assignment_detail(request, pk):
                 elapsed = (now - submission.started_at).total_seconds()
                 allowed = assignment.time_limit * 60
                 if elapsed > allowed + 60: # 1 minute grace period for network latency
-                    can_submit = False
-                    submission.is_time_expired = True
-                    submission.status = 'PENDING' # Or graded with 0
-                    submission.save()
+                    if request.method == 'POST':
+                        # Allow saving this final POST, but mark it as expired
+                        submission.is_time_expired = True
+                        # We don't set can_submit = False here so the POST is processed
+                    else:
+                        can_submit = False
+                        submission.is_time_expired = True
+                        submission.status = 'PENDING' # Or graded with 0
+                        submission.save()
                 else:
                     time_left_seconds = int(allowed - elapsed)
                     if time_left_seconds < 0: