diff --git a/modules/mfa/public/prompt-for-mfa.php b/modules/mfa/public/prompt-for-mfa.php
index 9d9038f3..c9511f4c 100644
--- a/modules/mfa/public/prompt-for-mfa.php
+++ b/modules/mfa/public/prompt-for-mfa.php
@@ -125,7 +125,7 @@
 $t->data['mfa_options'] = $mfaOptions;
 $browserJsHash = md5_file(__DIR__ . '/simplewebauthn/browser.js');
 $t->data['browser_js_path'] = '/module.php/mfa/simplewebauthn/browser.js?v=' . $browserJsHash;
-$t->data['remember_me_js_path'] = '/module.php/mfa/public/remember-me.js';
+$t->data['remember_me_js_path'] = '/module.php/mfa/remember-me.js';
 $t->data['manager_email'] = $state['managerEmail'];
 $t->data['other_options'] = $otherOptions;
 $t->data['idp_name'] = $t->getEntityDisplayName($state['IdPMetadata']);
diff --git a/modules/mfa/public/remember-me.js b/modules/mfa/public/remember-me.js
index 3683e3a8..90b50f9b 100644
--- a/modules/mfa/public/remember-me.js
+++ b/modules/mfa/public/remember-me.js
@@ -11,4 +11,11 @@ document.addEventListener('DOMContentLoaded', function() {
       localStorage.setItem('desiredRememberMeState', rememberMeCheckbox.checked);
     });
   }
+
+  const form = document.querySelector('form');
+  if (form) {
+    form.addEventListener('submit', function() {
+      localStorage.removeItem('desiredRememberMeState');
+    });
+  }
 });