diff --git a/e107_admin/users.php b/e107_admin/users.php
index be59916a7..fb2ead55a 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -517,7 +517,7 @@ class users_admin_ui extends e_admin_ui
 			
 			e107::getLog()->add('USET_10', str_replace(array('--UID--', '--NAME--', '--EMAIL--'), array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_166), E_LOG_INFORMATIVE);
 			$e_event->trigger('userfull', $row); //BC
-			e107::getEvent()->trigger('admin-user-verify', $row);
+			e107::getEvent()->trigger('admin-user-activate', $row);
 			
 			$mes->addSuccess(USRLAN_86." (#".$sysuser->getId()." : ".$sysuser->getName().' - '.$sysuser->getValue('email').")");
 			
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 409aefd84..cfbc32df6 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -3568,7 +3568,10 @@ class e_admin_controller_ui extends e_admin_controller
 	 */
 	protected function parseCustomListQry($qry)
 	{
-		e107::getMessage()->addDebug('Using Custom listQry ');	
+		if(E107_DEBUG_LEVEL == E107_DBG_SQLQUERIES)
+		{
+			e107::getMessage()->addDebug('Using Custom listQry ');	
+		}
 			
 		if(strpos($qry,'`')===false && strpos($qry, 'JOIN')===false) 
 		{
@@ -3601,7 +3604,10 @@ class e_admin_controller_ui extends e_admin_controller
 		$searchQuery = $tp->toDB($request->getQuery('searchquery', ''));
 		$searchFilter = $this->_parseFilterRequest($request->getQuery('filter_options', ''));
 		
-		e107::getMessage()->addDebug('searchQuery: <b>'.$searchQuery.'</b>'); 
+		if(E107_DEBUG_LEVEL == E107_DBG_SQLQUERIES)
+		{
+			e107::getMessage()->addDebug('searchQuery: <b>'.$searchQuery.'</b>'); 
+		}
 
 		if($searchFilter && is_array($searchFilter))
 		{
@@ -3887,9 +3893,10 @@ class e_admin_controller_ui extends e_admin_controller
 		}
 
 		// Debug Filter Query.
-	
-		e107::getMessage()->addDebug('QRY='.str_replace('#', MPREFIX, $qry));
-	
+		if(E107_DEBUG_LEVEL == E107_DBG_SQLQUERIES)
+		{
+			e107::getMessage()->addDebug('QRY='.str_replace('#', MPREFIX, $qry));
+		}
 	//	 echo $qry.'<br />';	
 	// print_a($this->fields);	
 	
@@ -3939,6 +3946,19 @@ class e_admin_controller_ui extends e_admin_controller
 		}
 
 
+		// Trigger Admin-ui event.  'pre'
+		if($triggerName = $this->getEventTriggerName($_posted['etrigger_submit'])) // 'create' or 'update'; 
+		{
+			$eventData = array('newData'=>$_posted,'oldData'=>$old_data,'id'=> $id);
+			$model->addMessageDebug('Admin-ui Trigger fired: <b>'.$triggerName.'</b> with data '.print_a($eventData,true)); 
+			if($halt = e107::getEvent()->trigger($triggerName, $eventData))
+			{
+				$model->setMessages();
+				return false; 
+			}	
+		}
+
+
 		// Scenario I - use request owned POST data - toForm already executed
 		$model->setPostedData($_posted, null, false, false)
 			->save(true);
@@ -3954,12 +3974,12 @@ class e_admin_controller_ui extends e_admin_controller
 			$new_data 		= $model->getData();
 			$id 			= $model->getId(); 
 
-			// Trigger Admin-ui event. 
-			if($triggerName = $this->getEventTriggerName($_posted['etrigger_submit']))
+			// Trigger Admin-ui event. 'post' 
+			if($triggerName = $this->getEventTriggerName($_posted['etrigger_submit']).'d') // 'created' or 'updated'; 
 			{
-				$eventData = array('newData'=>$new_data,'oldData'=>$old_data,'id'=> $id);
-				e107::getMessage()->addDebug('Admin-ui Trigger: '.$triggerName.' with data'.print_a($eventData,true),'default',true); 
-				e107::getEvent()->trigger($triggerName, $eventData); 	
+				$eventData = array('newData'=>$_posted,'oldData'=>$old_data,'id'=> $id);
+				$model->addMessageDebug('Admin-ui Trigger fired: <b>'.$triggerName.'</b> with data '.print_a($eventData,true)); 
+				e107::getEvent()->trigger($triggerName, $eventData);	
 			}
 			
 			if($callbackAfter && method_exists($this, $callbackAfter))
@@ -4639,17 +4659,29 @@ class e_admin_ui extends e_admin_controller_ui
 			$data = $model->getData();
 			if($this->beforeDelete($data, $id))
 			{
-				$check = $this->getTreeModel()->delete($id);
 				
-				if($triggerName = $this->getEventTriggerName('delete'))
+				$eventData = array('oldData'=>$data,'id'=> $id);
+				
+				if($triggerName = $this->getEventTriggerName('delete')) // trigger for before. 
 				{
-					$eventData = array('newData'=>$data,'oldData'=>$data,'id'=> $id);
-					e107::getMessage()->addDebug('Admin-ui Trigger: '.$triggerName.' with data '.print_a($eventData,true),'default',true); //FIXME - Why doesn't this display?
-					e107::getEvent()->trigger($triggerName, $eventData); 	
+					$this->getTreeModel()->addMessageDebug('Admin-ui Trigger fired: <b>'.$triggerName.'</b> with data '.print_a($eventData,true)); 
+					if($halt = e107::getEvent()->trigger($triggerName, $eventData))
+					{
+						$this->getTreeModel()->setMessages();
+						return; 
+					} 	
 				}
+				
+				$check = $this->getTreeModel()->delete($id);
 				 		 
 				if($this->afterDelete($data, $id, $check))
 				{
+					if($triggerName = $this->getEventTriggerName('deleted')) // trigger for after. 
+					{
+						$this->getTreeModel()->addMessageDebug('Admin-ui Trigger fired: <b>'.$triggerName.'</b>'); //FIXME - Why doesn't this display?
+						e107::getEvent()->trigger($triggerName, $eventData); 	
+					}
+					
 					$this->getTreeModel()->setMessages();
 				}
 			}
diff --git a/e107_handlers/debug_handler.php b/e107_handlers/debug_handler.php
index a9fa9991b..87b9c717d 100644
--- a/e107_handlers/debug_handler.php
+++ b/e107_handlers/debug_handler.php
@@ -46,14 +46,17 @@ if (!defined('e107_INIT')) { exit; }
 // If debugging enabled, set it all up
 // If no debugging, then E107_DEBUG_LEVEL will be zero
 //
-if (strstr(e_MENU, "debug") || isset($_COOKIE['e107_debug_level'])) {
+if (strstr(e_MENU, "debug") || isset($_COOKIE['e107_debug_level'])) 
+{
 	$e107_debug = new e107_debug;
 	require_once(e_HANDLER.'db_debug_class.php');
 	$db_debug = new e107_db_debug;
 	$e107_debug->set_error_reporting();
 	$e107_debug_level = $e107_debug->debug_level;
 	define('E107_DEBUG_LEVEL', $e107_debug_level);
-} else {
+} 
+else 
+{
 	define('E107_DEBUG_LEVEL', 0);
 }
 
@@ -141,7 +144,7 @@ class e107_debug {
 				$dVal |= $curDVal;
 		  }
 		}
-				
+								
 		if (isset($debug_param[3]))
 		{
 		  if ($debug_param[3] == '+' || $debug_param[3] == 'stick')
diff --git a/e107_handlers/model_class.php b/e107_handlers/model_class.php
index fc7334437..cb1c4071a 100644
--- a/e107_handlers/model_class.php
+++ b/e107_handlers/model_class.php
@@ -2594,7 +2594,10 @@ class e_front_model extends e_model
 			break;
 		}
 
-		$this->addMessageDebug('SQL Qry: '.print_a($qry,true), $session_messages);
+		if(E107_DEBUG_LEVEL == E107_DBG_SQLQUERIES)
+		{
+			$this->addMessageDebug('SQL Qry: '.print_a($qry,true), $session_messages);
+		}
 		return $qry;
 	}