diff --git a/modules/Vtiger/handlers/FollowRecordHandler.php b/modules/Vtiger/handlers/FollowRecordHandler.php
index 80952ca9e8f4db2a5ae22f574798f89f6058beeb..4d46a1ac10a9aa0bc488cbf0572e4fd2b629b814 100644
--- a/modules/Vtiger/handlers/FollowRecordHandler.php
+++ b/modules/Vtiger/handlers/FollowRecordHandler.php
@@ -24,7 +24,11 @@ class FollowRecordHandler extends VTEventHandler {
 			$recordId = $entityData->getId();
 			$moduleName = $entityData->getModuleName();
 
-			if ($moduleName != 'Users') {
+			$restrictedModules = array('CustomerPortal', 'Dashboard', 'Emails', 'EmailTemplates', 'ExtensionStore', 'Google', 'Home',
+										'Import', 'MailManager', 'Mobile', 'ModComments', 'ModTracker', 'PBXManager', 'Portal',
+										'RecycleBin', 'Reports', 'Rss', 'SMSNotifier', 'Users', 'Webforms', 'Webmails', 'WSAPP');
+
+			if (!in_array($moduleName, $restrictedModules)) {
 				$tableName = Vtiger_Functions::getUserSpecificTableName($moduleName);
 
 				//following users