diff --git a/src/com_tjnotifications/admin/models/forms/notification.xml b/src/com_tjnotifications/admin/models/forms/notification.xml
index 535a17e3..8aa70ebd 100644
--- a/src/com_tjnotifications/admin/models/forms/notification.xml
+++ b/src/com_tjnotifications/admin/models/forms/notification.xml
@@ -18,7 +18,7 @@
 				label="COM_TJNOTIFICATIONS_FIELD_CLIENT_LABEL"
 				description="COM_TJNOTIFICATIONS_FIELD_CLIENT_DESC"
 				type="sql"
-				query="select name from `#__extensions` where type='component' "
+				query="select LOWER(name) as name from `#__extensions` where type='component' "
 				key_field="name"
 				value_field="name"
 				required="true"
diff --git a/src/com_tjnotifications/admin/models/notification.php b/src/com_tjnotifications/admin/models/notification.php
index 6c8c4e21..ca188d5f 100644
--- a/src/com_tjnotifications/admin/models/notification.php
+++ b/src/com_tjnotifications/admin/models/notification.php
@@ -17,6 +17,19 @@
  */
 class TjnotificationsModelNotification extends JModelAdmin
 {
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since   3.2
+	 */
+	public function __construct($config = array())
+	{
+		$config['event_after_save'] = 'tjnOnAfterSaveNotificationTemplate';
+		parent::__construct($config);
+	}
+
 	/**
 	 * Returns a reference to the a Table object, always creating it.
 	 *
@@ -182,6 +195,9 @@ public function delete(&$cid)
 				{
 					$value[] = 1;
 					parent::delete($data->id);
+					$dispatcher = JDispatcher::getInstance();
+					JPluginHelper::importPlugin('tjnotification');
+					$dispatcher->trigger('tjnOnAfterDeleteNotificationTemplate', array($data));
 				}
 			}
 			else
diff --git a/src/com_tjnotifications/install.tjnotification.php b/src/com_tjnotifications/install.tjnotification.php
index 1cf0fd1b..0bc77591 100644
--- a/src/com_tjnotifications/install.tjnotification.php
+++ b/src/com_tjnotifications/install.tjnotification.php
@@ -15,6 +15,19 @@
  **/
 class Com_TjnotificationsInstallerScript
 {
+	/** @var array The list of extra modules and plugins to install */
+	private $queue = array(
+		// Plugins => { (folder) => { (element) => (published) }* }*
+		'plugins' => array(
+			'actionlog' => array(
+				'tjnotification' => 1
+			),
+			'privacy' => array(
+				'tjnotification' => 1,
+			),
+		),
+	);
+
 	/**
 	 * method to install the component
 	 *
@@ -26,6 +39,57 @@ public function install($parent)
 	{
 	}
 
+	/**
+ 	* This method is called after a component is uninstalled.
+ 	*
+ 	* @param   \stdClass  $parent  Parent object calling this method.
+ 	*
+ 	* @return void
+ 	*/
+	public function uninstall($parent)
+	{
+		jimport('joomla.installer.installer');
+		$db              = JFactory::getDBO();
+		$status          = new JObject;
+		$status->plugins = array();
+		$src             = $parent->getParent()->getPath('source');
+
+		// Plugins uninstallation
+		if (count($this->queue['plugins']))
+		{
+			foreach ($this->queue['plugins'] as $folder => $plugins)
+			{
+				if (count($plugins))
+				{
+					foreach ($plugins as $plugin => $published)
+					{
+						$sql = $db->getQuery(true)->select($db->qn('extension_id'))
+						->from($db->qn('#__extensions'))
+						->where($db->qn('type') . ' = ' . $db->q('plugin'))
+						->where($db->qn('element') . ' = ' . $db->q($plugin))
+						->where($db->qn('folder') . ' = ' . $db->q($folder));
+						$db->setQuery($sql);
+
+						$id = $db->loadResult();
+
+						if ($id)
+						{
+							$installer         = new JInstaller;
+							$result            = $installer->uninstall('plugin', $id);
+							$status->plugins[] = array(
+								'name' => 'plg_' . $plugin,
+								'group' => $folder,
+								'result' => $result
+							);
+						}
+					}
+				}
+			}
+		}
+
+		return $status;
+	}
+
 	/**
 	 * method to update the component
 	 *
@@ -38,6 +102,7 @@ public function update($parent)
 		// Install SQL FIles
 		$this->installSqlFiles($parent);
 		$this->fix_db_on_update();
+		$this->fixMenuLinks();
 	}
 
 	/**
@@ -62,6 +127,71 @@ public function preflight($type, $parent)
 	 */
 	public function postflight($type, $parent)
 	{
+		$src             = $parent->getParent()->getPath('source');
+		$db              = JFactory::getDbo();
+		$status          = new JObject;
+		$status->plugins = array();
+
+		// Plugins installation
+		if (count($this->queue['plugins']))
+		{
+			foreach ($this->queue['plugins'] as $folder => $plugins)
+			{
+				if (count($plugins))
+				{
+					foreach ($plugins as $plugin => $published)
+					{
+						$path = "$src/plugins/$folder/$plugin";
+
+						if (!is_dir($path))
+						{
+							$path = "$src/plugins/$folder/plg_$plugin";
+						}
+
+						if (!is_dir($path))
+						{
+							$path = "$src/plugins/$plugin";
+						}
+
+						if (!is_dir($path))
+						{
+							$path = "$src/plugins/plg_$plugin";
+						}
+
+						if (!is_dir($path))
+						{
+							continue;
+						}
+
+						// Was the plugin already installed?
+						$query = $db->getQuery(true)
+							->select('COUNT(*)')
+							->from($db->qn('#__extensions'))
+							->where($db->qn('element') . ' = ' . $db->q($plugin))
+							->where($db->qn('folder') . ' = ' . $db->q($folder));
+						$db->setQuery($query);
+						$count = $db->loadResult();
+
+						$installer = new JInstaller;
+						$result = $installer->install($path);
+
+						$status->plugins[] = array('name' => 'plg_' . $plugin, 'group' => $folder, 'result' => $result);
+
+						if ($published && !$count)
+						{
+							$query = $db->getQuery(true)
+								->update($db->qn('#__extensions'))
+								->set($db->qn('enabled') . ' = ' . $db->q('1'))
+								->where($db->qn('element') . ' = ' . $db->q($plugin))
+								->where($db->qn('folder') . ' = ' . $db->q($folder));
+							$db->setQuery($query);
+							$db->execute();
+						}
+					}
+				}
+			}
+		}
+
 		// Install SQL FIles
 		$this->installSqlFiles($parent);
 	}
@@ -212,4 +342,27 @@ public function fix_db_on_update()
 
 		$this->fixTemplateTable($db, $dbprefix, $config);
 	}
+
+	/**
+	 * Fix Duplicate menu created for Notification
+	 *
+	 * @return  void
+	 *
+	 * @Since 1.1
+	 */
+	public function fixMenuLinks()
+	{
+		$db = JFactory::getDbo();
+		$link = 'index.php?option=com_tjnotifications&view=notifications&extension=com_jticketing';
+		$link1 = 'index.php?option=com_tjnotifications&extension=com_tjvendors';
+		$allLinks = '"' . $link . '","'. $link1 . '"';
+
+		// Delete the mainmenu from menu table
+		$deleteMenu = $db->getQuery(true);
+		$deleteMenu->delete($db->quoteName('#__menu'));
+		$deleteMenu->where($db->quoteName('link') . 'IN (' . $allLinks . ')');
+		$deleteMenu->where($db->quoteName('level') . " = 1");
+		$db->setQuery($deleteMenu);
+		$db->execute();
+	}
 }
diff --git a/src/com_tjnotifications/site/controllers/preferences.php b/src/com_tjnotifications/site/controllers/preferences.php
index e3fb1e56..65718327 100644
--- a/src/com_tjnotifications/site/controllers/preferences.php
+++ b/src/com_tjnotifications/site/controllers/preferences.php
@@ -24,7 +24,7 @@ class TJNotificationsControllerPreferences extends JControllerForm
 	 * @since   1.6
 	 */
 
-		public function save()
+		public function save($key = null, $urlVar = '')
 		{
 			$jinput = JFactory::getApplication()->input;
 			$clientName = $jinput->get('client_name', '');
diff --git a/src/com_tjnotifications/site/models/preferences.php b/src/com_tjnotifications/site/models/preferences.php
index 19f0c089..e976a0fd 100644
--- a/src/com_tjnotifications/site/models/preferences.php
+++ b/src/com_tjnotifications/site/models/preferences.php
@@ -111,6 +111,9 @@ public function save($data)
 		if ($data)
 		{
 			parent::save($data);
+			$dispatcher = JDispatcher::getInstance();
+			JPluginHelper::importPlugin('tjnotification');
+			$dispatcher->trigger('tjnOnAfterUnsubscribeNotification', array($data));
 
 			return true;
 		}
@@ -133,6 +136,9 @@ public function deletePreference(&$data)
 	{
 		if ($data)
 		{
+			$dispatcher = JDispatcher::getInstance();
+			JPluginHelper::importPlugin('tjnotification');
+			$dispatcher->trigger('tjnOnAfterResubscribeNotification', array($data));
 			$db = JFactory::getDbo();
 			$query = $db->getQuery(true);
 			$conditions = array(
@@ -281,7 +287,7 @@ public function getUnsubscribedUsers($client,$key)
 						);
 		$db->setQuery($query);
 		$userIds = $db->loadObjectList();
-		$unsubscribed_users = '';
+		$unsubscribed_users = array();
 
 		foreach ($userIds as $userId)
 		{
diff --git a/src/com_tjnotifications/site/views/preferences/tmpl/default.php b/src/com_tjnotifications/site/views/preferences/tmpl/default.php
index 14efac69..d8965857 100644
--- a/src/com_tjnotifications/site/views/preferences/tmpl/default.php
+++ b/src/com_tjnotifications/site/views/preferences/tmpl/default.php
@@ -12,6 +12,7 @@
 
 <script src="/jquery.min.js"></script>
 <script type="text/javascript">
+	const tjnBaseurl = "<?php echo JUri::root();?>";
 	jQuery.noConflict();
 	jQuery(".btn-group > .btn").click(function(){
     jQuery(this).addClass("active").siblings().removeClass("active");
@@ -24,7 +25,7 @@ function addPreferance(pId,client,provider,key)
 			jQuery.ajaxSetup({
 				global: false,
 				type:'post',
-				url:'index.php?option=com_tjnotifications&task=preferences.save',
+				url:tjnBaseurl+'index.php?option=com_tjnotifications&task=preferences.save',
 				dataType:'json',
 				beforeSend: function () {
 					jQuery('#ajax-loader'+pId).show();
@@ -65,7 +66,7 @@ function removePreferance(pId,client,provider,key)
 			jQuery.ajaxSetup({
 				global: false,
 				type:'post',
-				url:'index.php?option=com_tjnotifications&task=preferences.delete',
+				url:tjnBaseurl+'index.php?option=com_tjnotifications&task=preferences.delete',
 
 				beforeSend: function () {
 					jQuery('#ajax-loader'+pId).show();
diff --git a/src/plugins/actionlog/tjnotification/index.html b/src/plugins/actionlog/tjnotification/index.html
new file mode 100644
index 00000000..1652ee13
--- /dev/null
+++ b/src/plugins/actionlog/tjnotification/index.html
@@ -0,0 +1,2 @@
+<html><body bgcolor="#FFFFFF"></body></html>
+
diff --git a/src/plugins/actionlog/tjnotification/language/en-GB/en-GB.plg_actionlog_tjnotification.ini b/src/plugins/actionlog/tjnotification/language/en-GB/en-GB.plg_actionlog_tjnotification.ini
new file mode 100644
index 00000000..f942efee
--- /dev/null
+++ b/src/plugins/actionlog/tjnotification/language/en-GB/en-GB.plg_actionlog_tjnotification.ini
@@ -0,0 +1,21 @@
+; @package     TJNotifications
+; @subpackage  Actionlog.tjNotifications
+; @copyright   Copyright (C) 2009 - 2018 Techjoomla. All rights reserved.
+; @license     GNU General Public License version 2 or later
+; Note:        All ini files need to be saved as UTF-8
+
+PLG_ACTIONLOG_TJNOTIFICATION="Action Log - TJNotifications"
+PLG_ACTIONLOG_TJNOTIFICATION_XML_DESCRIPTION="Record the actions of users on the site for TJNotifications extension so they can be reviewed if required."
+
+; Config
+PLG_ACTIONLOG_TJNOTIFICATION_LOG_ACTION_NOTIFICATION_SUBSCRIPTION="Log action if user unsubscribes/resubscribes for notifications?"
+PLG_ACTIONLOG_TJNOTIFICATION_LOG_ACTION_NEW_TEMPLATE="Log action for creation or update notification template?"
+PLG_ACTIONLOG_TJNOTIFICATION_LOG_ACTION_DELETE_TEMPLATE="Log action for delete notification template?"
+PLG_ACTIONLOG_TJNOTIFICATION_LOG_ACTION_COMMON_DESC="This action will be logged only when you set this to 'Yes'"
+
+; Event
+PLG_ACTIONLOG_TJNOTIFICATION_NOTIFICATION_UNSUBSCRIBE="User <a href=\"{accountlink}\">{username}</a> has unsubscribed {client} {type} notification for <a href=\"{keylink}\">{key}."
+PLG_ACTIONLOG_TJNOTIFICATION_NOTIFICATION_RESUBSCRIBE="User <a href=\"{accountlink}\">{username}</a> has resubscribed {client} {type} notification for <a href=\"{keylink}\">{key}."
+PLG_ACTIONLOG_TJNOTIFICATION_TEMPLATE_ADD="User <a href=\"{accountlink}\">{username}</a> has added the template <a href=\"{keylink}\">{title}</a> for {client}."
+PLG_ACTIONLOG_TJNOTIFICATION_TEMPLATE_UPDATE="User <a href=\"{accountlink}\">{username}</a> has updated the template <a href=\"{keylink}\">{title}</a> for {client}."
+PLG_ACTIONLOG_TJNOTIFICATION_TEMPLATE_DELETE="User <a href=\"{accountlink}\">{username}</a> has deleted the template {title} for {client}."
diff --git a/src/plugins/actionlog/tjnotification/language/en-GB/en-GB.plg_actionlog_tjnotification.sys.ini b/src/plugins/actionlog/tjnotification/language/en-GB/en-GB.plg_actionlog_tjnotification.sys.ini
new file mode 100644
index 00000000..8cac6b5e
--- /dev/null
+++ b/src/plugins/actionlog/tjnotification/language/en-GB/en-GB.plg_actionlog_tjnotification.sys.ini
@@ -0,0 +1,8 @@
+; @package     TJ Notifications
+; @subpackage  Actionlog.tjNotifications
+; @copyright   Copyright (C) 2009 - 2018 Techjoomla. All rights reserved.
+; @license     GNU General Public License version 2 or later
+; Note:        All ini files need to be saved as UTF-8
+
+PLG_ACTIONLOG_TJNOTIFICATION="Action Log - TJ Notifications"
+PLG_ACTIONLOG_TJNOTIFICATION_XML_DESCRIPTION="Record the actions of users on the site for TJNotifications extension so they can be reviewed if required."
diff --git a/src/plugins/actionlog/tjnotification/tjnotification.php b/src/plugins/actionlog/tjnotification/tjnotification.php
new file mode 100644
index 00000000..6e30ab62
--- /dev/null
+++ b/src/plugins/actionlog/tjnotification/tjnotification.php
@@ -0,0 +1,238 @@
+<?php
+/**
+ * @package     TJ_Notification
+ * @subpackage  Actionlog.tjnotification
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2018 Techjoomla. All rights reserved.
+ * @license     GNU General Public License version 2 or later
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+
+JLoader::register('ActionlogsHelper', JPATH_ADMINISTRATOR . '/components/com_actionlogs/helpers/actionlogs.php');
+use Joomla\CMS\Factory;
+/**
+ * TJ Notification Actions Logging Plugin.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class PlgActionlogTjnotification extends JPlugin
+{
+	/**
+	 * Load plugin language file automatically so that it can be used inside component
+	 *
+	 * @var    boolean
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * On unsubscribing notification logging method
+	 *
+	 * Method is called after user unsubscribes for notification.
+	 *
+	 * @param   array  $data  com_tjnotification.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function tjnOnAfterUnsubscribeNotification($data)
+	{
+		if (!$this->params->get('logActionForNotificationSubscription', 1))
+		{
+			return;
+		}
+
+		JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_tjnotifications/tables');
+		$tjTableTemplate   = JTable::getInstance('notification', 'TjnotificationTable', array());
+		$tjTableTemplate->load(array('key' => $data['key']));
+		$context = Factory::getApplication()->input->get('option');
+		$userId = $data["user_id"];
+
+		if ($data["client"])
+		{
+			$language = Factory::getLanguage();
+			$language->load($data["client"]);
+		}
+
+		$user = Factory::getUser($userId);
+		$messageLanguageKey = 'PLG_ACTIONLOG_TJNOTIFICATION_NOTIFICATION_UNSUBSCRIBE';
+		$message = array(
+			'type'        => $data["provider"],
+			'userid'      => $userId,
+			'username'    => $user->name,
+			'key'         => $data["key"],
+			'client'      => JText::_(strtoupper($data["client"])),
+			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $userId,
+			'keylink'     => 'index.php?option=com_tjnotifications&view=notification&layout=edit&id=' . $tjTableTemplate->id
+		);
+		$this->addLog(array($message), $messageLanguageKey, $context, $userId);
+	}
+
+	/**
+	 * Proxy for ActionlogsModelUserlog addLog method
+	 *
+	 * This method adds a record to #__action_logs contains (message_language_key, message, date, context, user)
+	 *
+	 * @param   array   $messages            The contents of the messages to be logged
+	 * @param   string  $messageLanguageKey  The language key of the message
+	 * @param   string  $context             The context of the content passed to the plugin
+	 * @param   int     $userId              ID of user perform the action, usually ID of current logged in user
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+
+	protected function addLog($messages, $messageLanguageKey, $context, $userId = null)
+	{
+		JLoader::register('ActionlogsModelActionlog', JPATH_ADMINISTRATOR . '/components/com_actionlogs/models/actionlog.php');
+
+		/* @var ActionlogsModelActionlog $model */
+		$model = JModelLegacy::getInstance('Actionlog', 'ActionlogsModel');
+		$model->addLog($messages, $messageLanguageKey, $context, $userId);
+	}
+
+	/**
+	 * On saving notification template logging method
+	 *
+	 * Method is called after notification template is created or updated.
+	 *
+	 * @param   Object   $data      Holds the template data.
+	 * @param   Object   $recordId  Holds the template data.
+	 * @param   integer  $isNew     Gives the value of template id if present.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+
+	public function tjnOnAfterSaveNotificationTemplate($data, $recordId, $isNew)
+	{
+		if (!$this->params->get('logActionForNewNotificationTemplate', 1))
+		{
+			return;
+		}
+
+		$context = Factory::getApplication()->input->get('option');
+		$user = Factory::getUser();
+		$userId = $user->id;
+		$userName = $user->name;
+
+		if ($recordId->client)
+		{
+			$language = Factory::getLanguage();
+			$language->load($recordId->client);
+		}
+
+		if ($isNew)
+		{
+			$messageLanguageKey = 'PLG_ACTIONLOG_TJNOTIFICATION_TEMPLATE_ADD';
+		}
+		else
+		{
+			$messageLanguageKey = 'PLG_ACTIONLOG_TJNOTIFICATION_TEMPLATE_UPDATE';
+		}
+
+		$message = array(
+			'title'       => $recordId->title,
+			'userid'      => $userId,
+			'username'    => $userName,
+			'client'      => JText::_(strtoupper($recordId->client)),
+			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $userId,
+			'keylink'     => 'index.php?option=com_tjnotifications&view=notification&layout=edit&id=' . $recordId->id
+		);
+		$this->addLog(array($message), $messageLanguageKey, $context, $userId);
+	}
+
+	/**
+	 * On deleting notification template logging method
+	 *
+	 * Method is called after notification template is deleted.
+	 *
+	 * @param   Object  $data  Holds the template data.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+
+	public function tjnOnAfterDeleteNotificationTemplate($data)
+	{
+		if (!$this->params->get('logActionForDeleteNotificationTemplate', 1))
+		{
+			return;
+		}
+
+		$context = JFactory::getApplication()->input->get('option');
+		$user = Factory::getUser();
+		$userId = $user->id;
+
+		if ($data->client)
+		{
+			$language = Factory::getLanguage();
+			$language->load($data->client);
+		}
+
+		$userName = $user->name;
+		$messageLanguageKey = 'PLG_ACTIONLOG_TJNOTIFICATION_TEMPLATE_DELETE';
+
+		$message = array(
+			'title'       => $data->title,
+			'userid'      => $userId,
+			'username'    => $userName,
+			'client'      => JText::_(strtoupper($data->client)),
+			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $userId,
+
+		);
+		$this->addLog(array($message), $messageLanguageKey, $context, $userId);
+	}
+
+	/**
+	 * On resubscribing notification logging method
+	 *
+	 * Method is called after user resubscribes for notification.
+	 *
+	 * @param   array  $data  com_tjnotification.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function tjnOnAfterResubscribeNotification($data)
+	{
+		if (!$this->params->get('logActionForNotificationSubscription', 1))
+		{
+			return;
+		}
+
+		JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_tjnotifications/tables');
+		$tjTableTemplate   = JTable::getInstance('notification', 'TjnotificationTable', array());
+		$tjTableTemplate->load(array('key' => $data['key']));
+		$context = Factory::getApplication()->input->get('option');
+		$userId = $data["user_id"];
+
+		if ($data["client"])
+		{
+			$language = Factory::getLanguage();
+			$language->load($data["client"]);
+		}
+
+		$user = Factory::getUser($userId);
+		$messageLanguageKey = 'PLG_ACTIONLOG_TJNOTIFICATION_NOTIFICATION_RESUBSCRIBE';
+		$message = array(
+			'type'        => $data["provider"],
+			'userid'      => $userId,
+			'username'    => $user->name,
+			'key'         => $data["key"],
+			'client'      => JText::_(strtoupper($data["client"])),
+			'accountlink' => 'index.php?option=com_users&task=user.edit&id=' . $userId,
+			'keylink'     => 'index.php?option=com_tjnotifications&view=notification&layout=edit&id=' . $tjTableTemplate->id
+		);
+		$this->addLog(array($message), $messageLanguageKey, $context, $userId);
+	}
+}
diff --git a/src/plugins/actionlog/tjnotification/tjnotification.xml b/src/plugins/actionlog/tjnotification/tjnotification.xml
new file mode 100644
index 00000000..00f269fd
--- /dev/null
+++ b/src/plugins/actionlog/tjnotification/tjnotification.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension version="3.9" type="plugin" group="actionlog" method="upgrade">
+	<name>plg_actionlog_tjnotification</name>
+	<author>Techjoomla</author>
+	<creationDate>1st October 2018</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 Techjoomla. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>extensions@techjoomla.com</authorEmail>
+	<authorUrl>https://techjoomla.com</authorUrl>
+	<version>__DEPLOY_VERSION__</version>
+	<description>PLG_ACTIONLOG_TJNOTIFICATION_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="tjnotification">tjnotification.php</filename>
+		<file>index.html</file>
+	</files>
+	<languages folder="language">
+		<language tag="en-GB">en-GB/en-GB.plg_actionlog_tjnotification.ini</language>
+		<language tag="en-GB">en-GB/en-GB.plg_actionlog_tjnotification.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field name="logActionForNotificationSubscription" type="radio" label="PLG_ACTIONLOG_TJNOTIFICATION_LOG_ACTION_NOTIFICATION_SUBSCRIPTION" description="PLG_ACTIONLOG_TJNOTIFICATION_LOG_ACTION_COMMON_DESC" default="0" class="btn-group btn-group-yesno">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field name="logActionForNewNotificationTemplate" type="radio" label="PLG_ACTIONLOG_TJNOTIFICATION_LOG_ACTION_NEW_TEMPLATE" description="PLG_ACTIONLOG_TJNOTIFICATION_LOG_ACTION_COMMON_DESC" default="1" class="btn-group btn-group-yesno">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field name="logActionForDeleteNotificationTemplate" type="radio" label="PLG_ACTIONLOG_TJNOTIFICATION_LOG_ACTION_DELETE_TEMPLATE" description="PLG_ACTIONLOG_TJNOTIFICATION_LOG_ACTION_COMMON_DESC" default="1" class="btn-group btn-group-yesno">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/src/plugins/privacy/tjnotification/index.html b/src/plugins/privacy/tjnotification/index.html
new file mode 100644
index 00000000..2efb97f3
--- /dev/null
+++ b/src/plugins/privacy/tjnotification/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/src/plugins/privacy/tjnotification/language/en-GB/en-GB.plg_privacy_tjnotification.ini b/src/plugins/privacy/tjnotification/language/en-GB/en-GB.plg_privacy_tjnotification.ini
new file mode 100644
index 00000000..251e2d4f
--- /dev/null
+++ b/src/plugins/privacy/tjnotification/language/en-GB/en-GB.plg_privacy_tjnotification.ini
@@ -0,0 +1,11 @@
+; @package     TJ Notifications
+; @subpackage  Privacy.tjnotifications
+;
+; @author      Techjoomla <extensions@techjoomla.com>
+; @copyright   Copyright (C) 2009 - 2018 Techjoomla. All rights reserved.
+; @license     GNU General Public License version 2 or later
+; Note: All ini files need to be saved as UTF-8
+
+PLG_PRIVACY_TJNOTIFICATION="Privacy - TJNotifications"
+PLG_PRIVACY_TJNOTIFICATION_XML_DESCRIPTION="Responsible for processing privacy related requests for the TJNotifications data."
+PLG_PRIVACY_TJNOTIFICATION_PRIVACY_CAPABILITY_USER_DETAIL="TJNotifications stores the user information as user_id while unsubcribing for notifications"
diff --git a/src/plugins/privacy/tjnotification/language/en-GB/en-GB.plg_privacy_tjnotification.sys.ini b/src/plugins/privacy/tjnotification/language/en-GB/en-GB.plg_privacy_tjnotification.sys.ini
new file mode 100644
index 00000000..79ba1017
--- /dev/null
+++ b/src/plugins/privacy/tjnotification/language/en-GB/en-GB.plg_privacy_tjnotification.sys.ini
@@ -0,0 +1,10 @@
+; @package     TJNotification
+; @subpackage  Privacy.tjnotification
+;
+; @author      Techjoomla <extensions@techjoomla.com>
+; @copyright   Copyright (C) 2009 - 2018 Techjoomla. All rights reserved.
+; @license     GNU General Public License version 2 or later
+; Note: All ini files need to be saved as UTF-8
+
+PLG_PRIVACY_TJNOTIFICATION="Privacy - TJNotifications"
+PLG_PRIVACY_TJNOTIFICATION_XML_DESCRIPTION="Responsible for processing privacy related requests for the TJNotifications data."
diff --git a/src/plugins/privacy/tjnotification/tjnotification.php b/src/plugins/privacy/tjnotification/tjnotification.php
new file mode 100644
index 00000000..5c3019e5
--- /dev/null
+++ b/src/plugins/privacy/tjnotification/tjnotification.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * @package     TJNotifications
+ * @subpackage  Privacy.tjnotifications
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2018 Techjoomla. All rights reserved.
+ * @license     GNU General Public License version 2 or later
+ */
+
+// No direct access.
+defined('_JEXEC') or die();
+jimport('joomla.application.component.model');
+
+use Joomla\Utilities\ArrayHelper;
+JLoader::register('PrivacyPlugin', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/plugin.php');
+JLoader::register('PrivacyRemovalStatus', JPATH_ADMINISTRATOR . '/components/com_privacy/helpers/removal/status.php');
+
+/**
+ * Privacy plugin managing TJNotifications user data
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class PlgPrivacyTjnotification extends PrivacyPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Database object
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $db;
+
+	/**
+	 * Reports the privacy related capabilities for this plugin to site administrators.
+	 *
+	 * @return  array
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function onPrivacyCollectAdminCapabilities()
+	{
+		$this->loadLanguage();
+
+		return array(
+			JText::_('PLG_PRIVACY_TJNOTIFICATION') => array(
+				JText::_('PLG_PRIVACY_TJNOTIFICATION_PRIVACY_CAPABILITY_USER_DETAIL')
+			)
+		);
+	}
+
+	/**
+	 * Processes an export request for TJNotifications user data
+	 *
+	 * This event will collect data for the following tables:
+	 *
+	 * - #__notification_user_exclusions
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 * @param   JUser                $user     The user account associated with this request if available
+	 *
+	 * @return  PrivacyExportDomain[]
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function onPrivacyExportRequest(PrivacyTableRequest $request, JUser $user = null)
+	{
+		if (!$user)
+		{
+			return array();
+		}
+
+		/** @var JTableUser $userTable */
+		$userTable = JUser::getTable();
+		$userTable->load($user->id);
+
+		$domains = array();
+
+		// Create the domain for the JMailAlerts User Subscription data
+		$domains[] = $this->createTJNotificationsUnsubscriptionDomain($userTable);
+
+		return $domains;
+	}
+
+	/**
+	 * Create the domain for the TJNotifications User data
+	 *
+	 * @param   JTableUser  $user  The JTableUser object to process
+	 *
+	 * @return  PrivacyExportDomain
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	private function createTJNotificationsUnsubscriptionDomain(JTableUser $user)
+	{
+		$domain = $this->createDomain('TJNotifications unsubscription', 'TJNotifications unsubscription data');
+
+		$query = $this->db->getQuery(true)
+			->select('*')
+			->from($this->db->quoteName('#__tj_notification_user_exclusions'))
+			->where(
+						$this->db->quoteName('user_id') . ' = ' . $this->db->quote($user->id)
+				);
+		$userUnsubscriptionData = $this->db->setQuery($query)->loadAssocList();
+
+		if (!empty($userUnsubscriptionData))
+		{
+			foreach ($userUnsubscriptionData as $unsubscriptionData)
+			{
+				$domain->addItem($this->createItemFromArray($unsubscriptionData, $unsubscriptionData['user_id']));
+			}
+		}
+
+		return $domain;
+	}
+
+	/**
+	 * Performs validation to determine if the data associated with a remove information request can be processed
+	 *
+	 * This event will not allow a super user account to be removed
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 * @param   JUser                $user     The user account associated with this request if available
+	 *
+	 * @return  PrivacyRemovalStatus
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function onPrivacyCanRemoveData(PrivacyTableRequest $request, JUser $user = null)
+	{
+		$status = new PrivacyRemovalStatus;
+
+		if (!$user)
+		{
+			return $status;
+		}
+
+		return $status;
+	}
+
+	/**
+	 * Removes the data associated with a remove information request
+	 *
+	 * This event will remove the user data
+	 *
+	 * @param   PrivacyTableRequest  $request  The request record being processed
+	 * @param   JUser                $user     The user account associated with this request if available
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function onPrivacyRemoveData(PrivacyTableRequest $request, JUser $user = null)
+	{
+		// This plugin only processes data for registered user accounts
+		if (!$user)
+		{
+			return;
+		}
+
+		// If there was an error loading the user do nothing here
+		if ($user->guest)
+		{
+			return;
+		}
+
+		$db = $this->db;
+
+		// Delete TJNotification user data :
+		$query = $db->getQuery(true)
+				->delete($db->quoteName('#__tj_notification_user_exclusions'))
+				->where('user_id = ' . $user->id);
+		$db->setQuery($query);
+		$db->execute();
+	}
+}
diff --git a/src/plugins/privacy/tjnotification/tjnotification.xml b/src/plugins/privacy/tjnotification/tjnotification.xml
new file mode 100644
index 00000000..66ea90c2
--- /dev/null
+++ b/src/plugins/privacy/tjnotification/tjnotification.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.9" type="plugin" group="privacy" method="upgrade">
+	<name>plg_privacy_tjnotification</name>
+	<version>__DEPLOY_VERSION__</version>
+	<creationDate>5th October 2018</creationDate>
+	<author>Techjoomla</author>
+	<authorEmail>extensions@techjoomla.com</authorEmail>
+	<authorUrl>https://techjoomla.com</authorUrl>
+	<copyright>Copyright (c) 2009-2018 Techjoomla. All rights reserved.</copyright>
+	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
+	<description>PLG_PRIVACY_TJNOTIFICATION_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="tjnotification">tjnotification.php</filename>
+		<filename>index.html</filename>
+	</files>
+	<languages folder="language">
+		<language tag="en-GB">en-GB/en-GB.plg_privacy_tjnotification.ini</language>
+		<language tag="en-GB">en-GB/en-GB.plg_privacy_tjnotification.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic" />
+		</fields>
+	</config>
+</extension>