diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 4adb85350..50bb617d6 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -4844,7 +4844,7 @@ TEMPLATE;
 				$addonResults = $this->createAddons($_POST['addons']);
 			}
 			
-			
+		//	e107::getDebug()->log($_POST);
 			
 			unset($_POST['step'],$_POST['xml'], $_POST['addons']);
 		$thePlugin = $tp->filter($_POST['newplugin'],'file');
@@ -4869,12 +4869,11 @@ class ".$thePlugin."_adminArea extends e_admin_dispatcher
 	";
 	
 
-	unset($_POST['newplugin']);
+	unset($_POST['newplugin'], $_POST['mode']);
 
-	
 			foreach($_POST as $table => $vars) // LOOP Through Tables. 
 			{
-				if(vartrue($vars['mode']) && $vars['mode'] != 'exclude')
+				if(!empty($vars['mode']) && $vars['mode'] != 'exclude')
 				{
 
 					$vars['mode'] = $tp->filter($vars['mode']);
@@ -4908,7 +4907,7 @@ $text .= "
 ";
 			foreach($_POST as $table => $vars) // LOOP Through Tables. 
 			{
-				if(vartrue($vars['mode']) && $vars['mode'] != 'exclude' && !empty($vars['table']))
+				if(!empty($vars['mode']) && $vars['mode'] != 'exclude' && !empty($vars['table']))
 				{
 
 						$vars['mode'] = $tp->filter($vars['mode']);