diff --git a/data/CRMEntity.php b/data/CRMEntity.php
index e44091c544dde7fbc32a09acc4536f194818cc22..137273e437fd5b8ba01bd28ecdb0ccdb8df7c9da 100644
--- a/data/CRMEntity.php
+++ b/data/CRMEntity.php
@@ -985,7 +985,7 @@ class CRMEntity {
 
 		//Event triggering code
 		require_once("include/events/include.inc");
-
+		$em = null; // To avoid undefined variable warning.
 		//In Bulk mode stop triggering events
 		if(!self::isBulkSaveMode()) {
 			$em = new VTEventsManager($adb);
@@ -1003,6 +1003,7 @@ class CRMEntity {
 		$this->saveentity($module_name, $fileid);
 
 		if($em) {
+			file_put_contents('testing7.log',print_r($em,true),FILE_APPEND);
 			//Event triggering code
 			$em->triggerEvent("vtiger.entity.aftersave", $entityData);
 			$em->triggerEvent("vtiger.entity.aftersave.final", $entityData);
diff --git a/include/QueryGenerator/EnhancedQueryGenerator.php b/include/QueryGenerator/EnhancedQueryGenerator.php
index 3f6bcb5d52ffad4f4a780d691264bfcf3ff0248c..76ef9da0d6d4af78698a84095a36dcc4b055d4a9 100644
--- a/include/QueryGenerator/EnhancedQueryGenerator.php
+++ b/include/QueryGenerator/EnhancedQueryGenerator.php
@@ -90,6 +90,7 @@ class EnhancedQueryGenerator extends QueryGenerator {
 		$dateSpecificConditions = $customView->getStdFilterConditions();
 		$specialDateTimeConditions = Vtiger_Functions::getSpecialDateTimeCondtions();
 		foreach ($advFilterList as $groupindex => $groupcolumns) {
+			if(isset($groupcolumns))continue;
 			$filtercolumns = $groupcolumns['columns'];
 			if (php7_count($filtercolumns) > 0) {
 				$this->startGroup('');
diff --git a/layouts/v7/modules/Users/DeleteUser.tpl b/layouts/v7/modules/Users/DeleteUser.tpl
index 826b8ddfb8d43af1e29509391183d044d79a8347..09aad4589876256b09cbf90356631381435d712e 100644
--- a/layouts/v7/modules/Users/DeleteUser.tpl
+++ b/layouts/v7/modules/Users/DeleteUser.tpl
@@ -35,7 +35,7 @@
                        </div>
                     </div>
                                 
-                    {if !$PERMANENT}        
+                    {if !isset($PERMANENT)}        
                         <div class="form-group">
                             <label class="control-label fieldLabel col-sm-4"></label>
                                 <div class="controls fieldValue col-sm-8">
diff --git a/modules/Users/Users.php b/modules/Users/Users.php
index b88c9f8dc80954a434a3bfd912e5f44acd5a69dd..54f71f12e5f7bb6bda60c81665e115e63936480a 100755
--- a/modules/Users/Users.php
+++ b/modules/Users/Users.php
@@ -1725,7 +1725,7 @@ class Users extends CRMEntity {
 			foreach($fieldInstances as $blockInstance) {
 				foreach($blockInstance as $fieldInstance) {
 					$fieldName = $fieldInstance->getName();
-					$fieldValue = $data[$fieldName];
+					$fieldValue = isset($data[$fieldName]) ? $data[$fieldName] : '';
 					$dataType = $fieldInstance->getFieldDataType();
 					if($fieldInstance->isMandatory()) {
 						$mandatoryFields[] = $fieldName;
@@ -1767,6 +1767,7 @@ class Users extends CRMEntity {
 							unset($currencyId);
 					} else if($fieldName == 'language') {
 						foreach($allLanguages as $langKey => $langName) {
+							if(isset($fieldValue) && isset($langKey) && isset($langName))continue;
 							if(strtolower($fieldValue) == strtolower($langKey) || strtolower($fieldValue) == strtolower($langName)) {
 								$lang = $langKey;
 								break;
@@ -1781,6 +1782,11 @@ class Users extends CRMEntity {
 						$allUsers = Users_Record_Model::getAll();
 						$reportsTo = null;
 						foreach($allUsers as $user) {
+							$userName = $user->get('user_name');
+							$userLabel = $user->get('userlabel');
+							if (isset($userName) && isset($userLabel)) {
+								continue;
+							}
 							$userName = strtolower($user->get('user_name'));
 							$firstLastName = strtolower($user->get('userlabel'));
 							if(strtolower($fieldValue) == $userName || strtolower($fieldValue) == $firstLastName) {
@@ -1795,6 +1801,7 @@ class Users extends CRMEntity {
 						$picklistValues = $fieldInstance->getPicklistValues();
 						$emptyValuedPicklistFields = array('defaulteventstatus', 'defaultactivitytype', 'reminder_interval');
 						foreach($picklistValues as $picklistKey => $picklistValue) {
+							if(isset($fieldValue) && isset($picklistValue) && isset($picklistValue)) continue;
 							if(strtolower($fieldValue) == strtolower($picklistKey) || strtolower($fieldValue) == strtolower($picklistValue)) {
 								$selectedValue = $picklistKey;
 								break;
@@ -1843,7 +1850,7 @@ class Users extends CRMEntity {
 				$modelData = $recordModel->getData();
 				$recordModel->set('mode', '');
 				foreach($modelData as $fieldName => $fieldValue) {
-					$recordModel->set($fieldName, $record[$fieldName]);
+					$recordModel->set($fieldName, isset($record[$fieldName]) ? $record[$fieldName] : '');
 				}
 				$recordModel->save();
 				$plainPasswords[$recordModel->getId()] = $record['user_password'];
diff --git a/modules/Vtiger/models/ModuleMeta.php b/modules/Vtiger/models/ModuleMeta.php
index 7da3f8c4c5382fd955cb85b74983848c1ee7ef6c..700e439540354882a7655638329a95f67897a789 100644
--- a/modules/Vtiger/models/ModuleMeta.php
+++ b/modules/Vtiger/models/ModuleMeta.php
@@ -96,7 +96,7 @@ class Vtiger_ModuleMeta_Model extends Vtiger_Base_Model {
 			// TODO - Cleanup this once Query Generator support is corrected
 			if($fieldInstance->getFieldDataType() == 'reference') {
 				$referencedModules = $fieldInstance->getReferenceList();
-				if($referencedModules[0] == 'Users') {
+				if(isset($referencedModules[0]) && $referencedModules[0] == 'Users') {
 					continue;
 				}
 			}
diff --git a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportAdvanced.tpl b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportAdvanced.tpl
index 32e4210fa805d6e0af07a9396a0931bfa3485dd3..210e175d299afe283e73430d32f57634423d7b8a 100644
--- a/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportAdvanced.tpl
+++ b/pkg/vtiger/modules/Import/layouts/v7/modules/Import/ImportAdvanced.tpl
@@ -45,7 +45,7 @@
                          ACTIVESTEP=3 BREADCRUMB_LABELS=$LABELS MODULE=$MODULE}
                 <div class = "importBlockContainer">
                     <table class = "table table-borderless">
-                        {if $ERROR_MESSAGE neq ''}
+                        {if isset($ERROR_MESSAGE) && $ERROR_MESSAGE neq ''}
                             <tr>
                                 <td align="left">
                                     {$ERROR_MESSAGE}