diff --git a/WebModules.cpp b/WebModules.cpp
index 7ea73271..fe2872a1 100644
--- a/WebModules.cpp
+++ b/WebModules.cpp
@@ -307,6 +307,7 @@ void CWebSock::SetVars() {
 	m_Template["SessionIP"] = GetRemoteIP();
 	m_Template["Tag"] = CZNC::GetTag(GetSession()->GetUser() != NULL);
 	m_Template["SkinName"] = GetSkinName();
+	m_Template["_CSRF_Check"] = GetCSRFCheck();
 
 	if (GetSession()->IsAdmin()) {
 		m_Template["IsAdmin"] = "true";
diff --git a/modules/www/notes/index.tmpl b/modules/www/notes/index.tmpl
index 3b62d547..fad56494 100644
--- a/modules/www/notes/index.tmpl
+++ b/modules/www/notes/index.tmpl
@@ -1,6 +1,7 @@
 <? INC Header.tmpl ?>
 
 <form method="post" action="/mods/notes/addnote">
+	<? INC _csrf_check.tmpl ?>
 	<div class="section">
 		<h3>Add A Note</h3>
 		<div class="sectionbg">
diff --git a/modules/www/stickychan/index.tmpl b/modules/www/stickychan/index.tmpl
index 238756ae..3fd383c5 100644
--- a/modules/www/stickychan/index.tmpl
+++ b/modules/www/stickychan/index.tmpl
@@ -1,6 +1,7 @@
 <? INC Header.tmpl ?>
 
 <form action="" method="post">
+	<? INC _csrf_check.tmpl ?>
 	<table class="data">
 		<thead>
 			<tr>
diff --git a/modules/www/webadmin/add_edit_chan.tmpl b/modules/www/webadmin/add_edit_chan.tmpl
index 5acc593d..9a665639 100644
--- a/modules/www/webadmin/add_edit_chan.tmpl
+++ b/modules/www/webadmin/add_edit_chan.tmpl
@@ -1,6 +1,7 @@
 <? INC Header.tmpl ?>
 
 <form action="<? IF Edit ?>editchan<? ELSE ?>addchan<? ENDIF ?>" method="post">
+	<? INC _csrf_check.tmpl ?>
 	<div class="section">
 		<input type="hidden" name="submitted" value="1" />
 		<input type="hidden" name="user" value="<? VAR User ?>" />
diff --git a/modules/www/webadmin/add_edit_user.tmpl b/modules/www/webadmin/add_edit_user.tmpl
index 57ac34eb..f06c6021 100644
--- a/modules/www/webadmin/add_edit_user.tmpl
+++ b/modules/www/webadmin/add_edit_user.tmpl
@@ -1,6 +1,7 @@
 <? INC Header.tmpl ?>
 
 <form action="<? IF Edit ?>edituser<? ELSE ?>adduser<? ENDIF ?>" method="post">
+	<? INC _csrf_check.tmpl ?>
 	<div class="section">
 		<input type="hidden" name="submitted" value="1" />
 
diff --git a/modules/www/webadmin/settings.tmpl b/modules/www/webadmin/settings.tmpl
index 82f05581..cadcda59 100644
--- a/modules/www/webadmin/settings.tmpl
+++ b/modules/www/webadmin/settings.tmpl
@@ -1,6 +1,7 @@
 <? INC Header.tmpl ?>
 
 <form action="settings" method="post">
+	<? INC _csrf_check.tmpl ?>
 	<div class="section">
 		<input type="hidden" name="submitted" value="1" />
 
diff --git a/webskins/_default_/tmpl/_csrf_check.tmpl b/webskins/_default_/tmpl/_csrf_check.tmpl
new file mode 100644
index 00000000..2ce56556
--- /dev/null
+++ b/webskins/_default_/tmpl/_csrf_check.tmpl
@@ -0,0 +1 @@
+<input type="hidden" name="_CSRF_Check" value="<? VAR _CSRF_Check TOP ?>" />