diff --git a/auth/shibboleth/index_form.html b/auth/shibboleth/index_form.html
index 29943d6a8ea..7f46c14875a 100644
--- a/auth/shibboleth/index_form.html
+++ b/auth/shibboleth/index_form.html
@@ -54,6 +54,7 @@ if ($show_instructions) {
         </div>
         <form action="../../login/index.php" method="post" id="guestlogin">
           <div class="guestform">
+            <input type="hidden" name="logintoken" value="<?php echo s(\core\session\manager::get_login_token()); ?>" />
             <input type="hidden" name="username" value="guest" />
             <input type="hidden" name="password" value="guest" />
             <input type="submit" value="<?php print_string("loginguest") ?>" />
diff --git a/login/index_form.html b/login/index_form.html
index 11f568ae9d7..388df91735a 100644
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -74,9 +74,10 @@ if (empty($CFG->authloginviaemail)) {
         </div>
         <form action="index.php" method="post" id="guestlogin">
           <div class="guestform">
+            <input type="hidden" name="logintoken" value="<?php echo s(\core\session\manager::get_login_token()); ?>" />
             <input type="hidden" name="username" value="guest" />
             <input type="hidden" name="password" value="guest" />
-            <input type="submit" value="<?php print_string("loginguest") ?>" />
+            <input type="submit" value="<?php print_string("loginguest"); ?>" />
           </div>
         </form>
       </div>