diff --git a/app/modules/module_edit.php b/app/modules/module_edit.php
index 74f268f68f..6e3028143f 100644
--- a/app/modules/module_edit.php
+++ b/app/modules/module_edit.php
@@ -70,6 +70,14 @@
 				$module_uuid = $_POST["module_uuid"];
 			}
 
+		//validate the token
+			$token = new token;
+			if (!$token->validate($_SERVER['PHP_SELF'])) {
+				message::add($text['message-invalid_token'],'negative');
+				header('Location: modules.php');
+				exit;
+			}
+
 		//check for all required data
 			$msg = '';
 			if (strlen($module_label) == 0) { $msg .= $text['message-required'].$text['label-label']."<br>\n"; }
@@ -152,6 +160,10 @@
 		unset($sql, $parameters, $row);
 	}
 
+//create token
+	$object = new token;
+	$token = $object->create($_SERVER['PHP_SELF']);
+
 //show the header
 	require_once "resources/header.php";
 	if ($action == "add") {
@@ -290,6 +302,7 @@
 	if ($action == "update") {
 		echo "		<input type='hidden' name='module_uuid' value='".escape($module_uuid)."'>\n";
 	}
+	echo "			<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 	echo "			<br>";
 	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";