diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php
index d8164d686d..261d089f1b 100644
--- a/e107_admin/banlist.php
+++ b/e107_admin/banlist.php
@@ -10,7 +10,10 @@
  *
  *
 */
-
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	$_POST['e-token'] = '';
+}
 require_once(__DIR__.'/../class2.php');
 
 if (!getperms('4'))
@@ -534,7 +537,7 @@ protected function timesPage()
 						</table>
 						<div class='buttons-bar center'>
 							".$frm->admin_button('update_ban_prefs', LAN_UPDATE, 'update')."
-							<input type='hidden' name='e-token' value='".e_TOKEN."' />
+							<input type='hidden' name='e-token' value='".defset('e_TOKEN')."' />
 						</div>
 					</fieldset>
 				</form>
@@ -651,7 +654,7 @@ protected function optionsPage()
 						</table>
 						<div class='buttons-bar center'>
 							".$frm->admin_button('update_ban_options', LAN_UPDATE, 'update')."
-							<input type='hidden' name='e-token' value='".e_TOKEN."' />
+							<input type='hidden' name='e-token' value='".defset('e_TOKEN')."' />
 						</div>
 					</fieldset>
 					<fieldset id='core-banlist-options-ban'>
@@ -666,7 +669,7 @@ protected function optionsPage()
 									<td>".BANLAN_75."</td>
 									<td>
 										".$frm->admin_button('remove_expired_bans', BANLAN_76, 'delete')."
-										<input type='hidden' name='e-token' value='".e_TOKEN."' />
+										<input type='hidden' name='e-token' value='".defset('e_TOKEN')."' />
 									</td>
 								</tr>
 							</tbody>
diff --git a/e107_admin/cache.php b/e107_admin/cache.php
index 30174e95fd..e1e860f9fb 100644
--- a/e107_admin/cache.php
+++ b/e107_admin/cache.php
@@ -10,6 +10,10 @@
  *
 */
 
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	$_POST['e-token'] = '';
+}
 require_once(__DIR__."/../class2.php");
 
 if (!getperms("C"))
@@ -205,6 +209,7 @@
 					'empty_browsercache' => CACLAN_27,
 				))."
 				".$frm->admin_button('trigger_empty_cache', LAN_DELETE, 'delete')."
+				<input type='hidden' name='e-token' value='" . defset('e_TOKEN') . "' />
 			</div>
 		</fieldset>
 	</form>";
diff --git a/e107_admin/emoticon.php b/e107_admin/emoticon.php
index 38877299b5..d7b71a07d8 100644
--- a/e107_admin/emoticon.php
+++ b/e107_admin/emoticon.php
@@ -10,7 +10,10 @@
  *
  *
 */
-
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	$_POST['e-token'] = '';
+}
 require_once(__DIR__.'/../class2.php');
 if (!getperms("F"))
 {
@@ -157,6 +160,7 @@ function listPacks()
 						</table>
 						<div class='buttons-bar center'>
 						" . $frm->admin_button('active', 'active', 'update', LAN_UPDATE) . "
+						<input type='hidden' name='e-token' value='" . defset('e_TOKEN') . "' />
 						</div>
 					<fieldset>
 				</form>
@@ -228,7 +232,7 @@ function listPacks()
 			}
 
 			$text .= $frm->admin_button('XMLPack_' . $pack, 'submit', 'default', EMOLAN_28);
-			$text .= "
+			$text .= "<input type='hidden' name='e-token' value='" . defset('e_TOKEN') . "' />
 								</td>
 							</tr>
 			";
diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php
index db3bca19d7..7c616afa8f 100644
--- a/e107_admin/eurl.php
+++ b/e107_admin/eurl.php
@@ -9,7 +9,10 @@
  * URL and front controller Management
  *
 */
-
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	$_POST['e-token'] = '';
+}
 require_once(__DIR__.'/../class2.php');
 if (!getperms('K'))
 {
@@ -328,7 +331,9 @@ protected function simplePage()
 		}	
 
 		$text .= "<div class='buttons-bar center'>".$frm->button('saveSimpleSef',LAN_SAVE, 'submit')."</div>";
+		$text .= $frm->token();
 		$text .= $frm->close();
+
 		$text .= "</div>";
 		return $text;		
 	}
@@ -444,7 +449,8 @@ protected function AliasPage()
 						</tbody>
 					</table>
 					<div class='buttons-bar center'>
-						".$form->admin_button('update', LAN_UPDATE, 'update')."
+						".$form->admin_button('update', LAN_UPDATE, 'update').
+						$form->token()."
 					</div>
 				</fieldset>
 			</form>
@@ -564,7 +570,8 @@ protected function ConfigPage()
 						</tbody>
 					</table>
 					<div class='buttons-bar center'>
-						".$form->admin_button('update', LAN_UPDATE, 'update')."
+						".$form->admin_button('update', LAN_UPDATE, 'update').
+						$form->token()."
 					</div>
 				</fieldset>
 			</form>
diff --git a/e107_admin/search.php b/e107_admin/search.php
index e15ffe674d..c46c04a8ef 100644
--- a/e107_admin/search.php
+++ b/e107_admin/search.php
@@ -9,7 +9,10 @@
  * Search Administration
  *
 */
-
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	$_POST['e-token'] = '';
+}
 require_once(__DIR__.'/../class2.php');
 if (!getperms('X'))
 {
@@ -277,6 +280,7 @@
 			</table>
 			<div class='buttons-bar center'>
 				".$frm->admin_button('update_prefs', LAN_UPDATE, 'update')."
+				<input type='hidden' name='e-token' value='" . defset('e_TOKEN') . "' />
 			</div>
 		</fieldset>
 	</form>
@@ -348,6 +352,7 @@
 			</table>
 			<div class='buttons-bar center'>
 				".$frm->admin_button('update_handler', 'no-value', 'update', LAN_UPDATE)."
+				<input type='hidden' name='e-token' value='" . defset('e_TOKEN') . "' />
 			</div>
 		</fieldset>
 	</form>
@@ -520,6 +525,7 @@
 			</table>
 			<div class='buttons-bar center'>
 			".$frm->admin_button('update_main','no-value','update',LAN_UPDATE)."
+			<input type='hidden' name='e-token' value='" . defset('e_TOKEN') . "' />
 			</div>
 		</fieldset>
 		</form>
diff --git a/e107_plugins/social/admin_config.php b/e107_plugins/social/admin_config.php
index 77bb54517c..92e1cb1204 100644
--- a/e107_plugins/social/admin_config.php
+++ b/e107_plugins/social/admin_config.php
@@ -1,7 +1,10 @@
 <?php
 
 // Generated e107 Plugin Admin Area 
-
+if(!empty($_POST) && !isset($_POST['e-token']))
+{
+	$_POST['e-token'] = '';
+}
 require_once(__DIR__.'/../../class2.php');
 if (!getperms('P'))
 {
@@ -443,9 +446,10 @@ public function pagesPage()
 			$ret .= "<div class='buttons-bar center'>
 
 			".$frm->button('save_social_pages',1,'submit',LAN_SAVE)."
-
+			
 				</div>";
 
+			$ret .= $frm->token();
 			$ret .= $frm->close();
 
 			return $ret;
@@ -467,6 +471,7 @@ public function modifyPage()
 			$text .= $this->generateSocialLoginForm($var);
 
 			$text .= "<div class='buttons-bar center'>".$frm->button('save_social_logins',1,'submit',LAN_ADD)."</div>";
+			$text .= $frm->token();
 			$text .= $frm->close();
 
 			return $text;
@@ -563,6 +568,7 @@ public function configurePage()
 
 				</div>";
 
+			$ret .= $frm->token();
 			$ret .= $frm->close();
 
 			return $ret;