diff --git a/modules/Users/Users.php b/modules/Users/Users.php
index b2afeee5a5d5c4d655e97e060a00f82a10f83280..9b1ee1067f691ac91e652404a22545afb677f4ed 100755
--- a/modules/Users/Users.php
+++ b/modules/Users/Users.php
@@ -1851,7 +1851,7 @@ class Users extends CRMEntity {
 				$modelData = $recordModel->getData();
 				$recordModel->set('mode', '');
 				foreach($modelData as $fieldName => $fieldValue) {
-					$recordModel->set($fieldName, isset($record[$fieldName]) ? $record[$fieldName] : '');
+					$recordModel->set($fieldName, isset($record[$fieldName]) ? $record[$fieldName] : null);
 				}
 				$recordModel->save();
 				$plainPasswords[$recordModel->getId()] = $record['user_password'];
diff --git a/vtlib/Vtiger/AccessControl.php b/vtlib/Vtiger/AccessControl.php
index dddc174d3615c1d550ecf3f8f24e2b560fc41ef3..2a6ea7ed502527b347183bbf92180f3bd22396b1 100644
--- a/vtlib/Vtiger/AccessControl.php
+++ b/vtlib/Vtiger/AccessControl.php
@@ -49,7 +49,7 @@ class Vtiger_AccessControl {
 			self::$singleton = new self();
 		}
 
-		if ( self::$singleton->privileges && isset(self::$singleton->privileges[$id])&& self::$singleton->privileges[$id]) {
+		if ( self::$singleton->privileges ) {
 			unset(self::$singleton->privileges[$id]);
 		}
 	}