diff --git a/admin/module.php b/admin/module.php
index 3985475d244..1ab26d4e91e 100644
--- a/admin/module.php
+++ b/admin/module.php
@@ -13,6 +13,9 @@
         error("Site isn't defined!");
     }
 
+    if (!confirm_sesskey()) {
+        error(get_string('confirmsesskeybad', 'error'));
+    }
 
 /// If data submitted, then process and store.
 
diff --git a/admin/modules.php b/admin/modules.php
index 6b151372dd7..99fcb7a5869 100644
--- a/admin/modules.php
+++ b/admin/modules.php
@@ -165,7 +165,7 @@
         $delete = "<a href=\"modules.php?delete=$module->name\">$strdelete</a>";
 
         if (file_exists("$CFG->dirroot/mod/$module->name/config.html")) {
-            $settings = "<a href=\"module.php?module=$module->name\">$strsettings</a>";
+            $settings = "<a href=\"module.php?module=$module->name&sesskey=$USER->sesskey\">$strsettings</a>";
         } else {
             $settings = "";
         }
diff --git a/mod/assignment/config.html b/mod/assignment/config.html
index 26248960d46..4b8f5a640b9 100644
--- a/mod/assignment/config.html
+++ b/mod/assignment/config.html
@@ -1,4 +1,5 @@
 <form method="post" action="module.php" name="form">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
 
 <table cellpadding=9 cellspacing=0 >
 <tr valign=top>
diff --git a/mod/attendance/config.html b/mod/attendance/config.html
index 3948df19cdf..ae2bc82d655 100644
--- a/mod/attendance/config.html
+++ b/mod/attendance/config.html
@@ -1,4 +1,5 @@
 <form method="post" action="module.php" name="form">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
 
 <table cellpadding=9 cellspacing=0 >
 <tr valign=top>
diff --git a/mod/chat/config.html b/mod/chat/config.html
index a08339d4c13..303ce8f62e9 100644
--- a/mod/chat/config.html
+++ b/mod/chat/config.html
@@ -1,4 +1,5 @@
 <form method="post" action="module.php" name="form">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
 
 <table cellpadding=9 cellspacing=0 >
 
diff --git a/mod/forum/config.html b/mod/forum/config.html
index e142eb074a8..aa136a90017 100644
--- a/mod/forum/config.html
+++ b/mod/forum/config.html
@@ -1,4 +1,5 @@
 <form method="post" action="module.php" name="form">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
 
 <table cellpadding=9 cellspacing=0 >
 <tr valign=top>
diff --git a/mod/glossary/config.html b/mod/glossary/config.html
index 57ac5bf72d8..15fd0cb6200 100644
--- a/mod/glossary/config.html
+++ b/mod/glossary/config.html
@@ -3,6 +3,7 @@
     $no  = get_string("no");
 ?>
 <form method="post" action="module.php" name="form">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
 
 <table cellpadding=9 cellspacing=0 >
 <tr valign=top>
diff --git a/mod/glossary/formats.php b/mod/glossary/formats.php
index fdd38670769..a9fd2074694 100644
--- a/mod/glossary/formats.php
+++ b/mod/glossary/formats.php
@@ -32,7 +32,7 @@
             }
             update_record("glossary_formats",$displayformat);
         }
-        redirect("../../admin/module.php?module=glossary#formats");
+        redirect("../../admin/module.php?sesskey=$USER->sesskey&module=glossary#formats");
         die;
     } elseif ( $mode == 'edit' and $form) {
         
@@ -44,7 +44,7 @@
         $displayformat->sortorder   = $form->sortorder;
         
         update_record("glossary_formats",$displayformat);
-        redirect("../../admin/module.php?module=glossary#formats");
+        redirect("../../admin/module.php?sesskey=$USER->sesskey&module=glossary#formats");
         die;
     }
     
@@ -57,7 +57,7 @@
     print_header("$strmodulename: $strconfiguration", $site->fullname,
                   "<a href=\"../../admin/index.php\">$stradmin</a> -> ".
                   "<a href=\"../../admin/configure.php\">$strconfiguration</a> -> ".
-                  "<a href=\"../../admin/modules.php\">$strmanagemodules</a> -> <a href=\"../../admin/module.php?module=glossary\">$strmodulename</a> -> $strdisplayformats");
+                  "<a href=\"../../admin/modules.php\">$strmanagemodules</a> -> <a href=\"../../admin/module.php?module=glossary&sesskey=$USER->sesskey\">$strmodulename</a> -> $strdisplayformats");
 
     print_heading($strmodulename . ': ' . get_string("displayformats","glossary"));
 
diff --git a/mod/resource/config.html b/mod/resource/config.html
index 0e81fff2d79..ebeba2564a2 100644
--- a/mod/resource/config.html
+++ b/mod/resource/config.html
@@ -1,4 +1,5 @@
 <form method="post" action="module.php" name="form">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
 
 <table cellpadding=9 cellspacing=0 >
 <tr valign=top>
diff --git a/mod/scorm/config.html b/mod/scorm/config.html
index cc56c38d391..8801df9cdbd 100755
--- a/mod/scorm/config.html
+++ b/mod/scorm/config.html
@@ -1,4 +1,5 @@
 <form method="post" action="module.php" name="form">
+<input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>">
 
 <table cellpadding=9 cellspacing=0 >
 <tr valign=top>