diff --git a/include/Webservices/Retrieve.php b/include/Webservices/Retrieve.php
index 59e67bc9c8..948fcda140 100644
--- a/include/Webservices/Retrieve.php
+++ b/include/Webservices/Retrieve.php
@@ -60,7 +60,7 @@ function vtws_retrieve($id, $user) {
 			$listofrelfields[] = $entity[$relfield];
 		}
 	}
-	if ($entityName=='Users') {
+	if ($entityName=='Users' && !empty($entity['roleid'])) {
 		$entity['rolename'] = getRoleName($entity['roleid']);
 	}
 	if (!empty($listofrelfields)) {
diff --git a/include/Webservices/VtigerCRMObjectMeta.php b/include/Webservices/VtigerCRMObjectMeta.php
index 3ee800b5c6..585099618f 100644
--- a/include/Webservices/VtigerCRMObjectMeta.php
+++ b/include/Webservices/VtigerCRMObjectMeta.php
@@ -392,7 +392,7 @@ private function retrieveMetaForBlock($block) {
 		if ($userprivs->hasGlobalReadPermission() || $this->objectName == 'Users') {
 			$pf = $adb->pquery('select profileid from vtiger_role2profile where roleid=? limit 1', [$this->user->column_fields['roleid']]);
 			$profileForSummary = ($pf ? $pf->fields['profileid'] : 0);
-			if (empty($profileForSummary)) {
+			if (empty($profileForSummary) || $this->objectName == 'Users') {
 				$sql = "SELECT vtiger_field.*, '0' as readonly, vtiger_blocks.sequence as blkseq
 					FROM vtiger_field
 					LEFT JOIN vtiger_blocks ON vtiger_field.block=vtiger_blocks.blockid