diff --git a/modules/Vtiger/models/Field.php b/modules/Vtiger/models/Field.php
index e7ab867b972549c8bf77b877c9e9af35fe08cf7a..af057952954149e2f626c1a35a287858664ccee9 100644
--- a/modules/Vtiger/models/Field.php
+++ b/modules/Vtiger/models/Field.php
@@ -1324,7 +1324,7 @@ class Vtiger_Field_Model extends Vtiger_Field {
 				$fieldName = $referenceFieldName;
 			}
 
-			if (!in_array($fieldName, array('hdnTaxType', 'region_id'))) {
+			if (!in_array($fieldName, array('hdnTaxType', 'region_id')) && !in_array($this->getModuleName(), array('Users'))) {
 				$db = PearDatabase::getInstance();
 				$picklistValues = $this->getPicklistValues();
 				$tableName = "vtiger_$fieldName";
diff --git a/packages/vtiger/mandatory/Import.zip b/packages/vtiger/mandatory/Import.zip
index 885aaeb8921e93bb8bd33caf702ef7ba03843846..ac2e010996b323b7dfef1a5b9575caa888fa741e 100644
Binary files a/packages/vtiger/mandatory/Import.zip and b/packages/vtiger/mandatory/Import.zip differ
diff --git a/pkg/vtiger/modules/Import/modules/Import/actions/Data.php b/pkg/vtiger/modules/Import/modules/Import/actions/Data.php
index 4ab19d09c2b5e2e1c10de90a6614d1a1ce25cc7d..088f1de875c9a70887b29658e90f5c4e5b922539 100644
--- a/pkg/vtiger/modules/Import/modules/Import/actions/Data.php
+++ b/pkg/vtiger/modules/Import/modules/Import/actions/Data.php
@@ -656,7 +656,7 @@ class Import_Data_Action extends Vtiger_Action_Controller {
 						$fieldData[$fieldName] = CurrencyField::convertToDBFormat($fieldValue, $current_user, false);
 					}
 				}
-			} else if($fieldInstance->getUIType() == 56) {
+			} else if($fieldDataType == 'boolean') {
 				$fieldValue = strtolower($fieldValue);
 				if($fieldValue == 'yes' || $fieldValue == 1) {
 					$fieldData[$fieldName] = 1;