diff --git a/orbit/radius.py b/orbit/radius.py
index 6bd323b7..75d9d6db 100644
--- a/orbit/radius.py
+++ b/orbit/radius.py
@@ -296,8 +296,8 @@ def mk_form_welcome(session):
          </div>
     </div>
     <div class="logout_buttons">
-        <form id="logout">
-            <input class="logout" type="button" onclick="location.href='/logout';" value="Logout" />
+        <form id="logout" method="get" action="/logout">
+            <input class="logout" type="submit" value="Logout" />
         </form>
     </div>'''
 
@@ -321,6 +321,7 @@ def login_form(target_location=None):
 
 
 def handle_login(rocket):
+    rocket.headers += [('Cache-Control', 'no-cache')]
     target = rocket.queries_query('target')
 
     # harden the redirect to prevent csrf type attacks
@@ -463,7 +464,7 @@ def get_automated_feedback(self, attr):
             case 'final':
                 due_date = int(self.assignment.final_due_date)
 
-        if due_date < int(datetime.now().timestamp()):
+        if due_date <= int(datetime.now().timestamp()):
             return gbl.auto_feedback
 
         match gbl.auto_feedback[-1]: