diff --git a/application/Espo/Entities/User.php b/application/Espo/Entities/User.php
index 2db29c3067..ec693d23b0 100644
--- a/application/Espo/Entities/User.php
+++ b/application/Espo/Entities/User.php
@@ -7,6 +7,11 @@ class User extends \Espo\ORM\Entity
 	public function isAdmin()
 	{
 		return $this->get('isAdmin');
-	}     
-
+	} 
+	
+	public function getName()
+	{
+		die;
+		return $this->get('firstName') . ' ' . $this->get('lastName');
+	}
 }
diff --git a/application/Espo/ORM/Entity.php b/application/Espo/ORM/Entity.php
index 9ca62549de..b44ae53ad0 100644
--- a/application/Espo/ORM/Entity.php
+++ b/application/Espo/ORM/Entity.php
@@ -172,10 +172,23 @@ abstract class Entity implements IEntity
 	
 	public function toArray()
 	{
-		$arr = $this->valuesContainer;
+		/*$arr = $this->valuesContainer;
 		if (isset($this->id)) {
 			$arr['id'] = $this->id;
 		}
+		return $arr;*/
+		
+		$arr = array();
+		if (isset($this->id)) {
+			$arr['id'] = $this->id;
+		}
+		foreach ($this->fields as $field => $defs) {		
+			if ($field == 'id') {
+				continue;
+			}
+			$arr[$field] = $this->get($field);
+
+		}		
 		return $arr;
 	}
 	
diff --git a/application/Espo/Resources/layouts/User/detail.json b/application/Espo/Resources/layouts/User/detail.json
index 65f7571340..d31fd4bbab 100644
--- a/application/Espo/Resources/layouts/User/detail.json
+++ b/application/Espo/Resources/layouts/User/detail.json
@@ -1 +1 @@
-[{"label":"Overview","rows":[[{"name":"userName"},{"name":"isAdmin"}],[{"name":"defaultTeam"},{"name":"title","0":false}],[{"name":"name"},{"name":"title"}],[{"name":"email"},{"name":"phone"}]]}]
\ No newline at end of file
+[{"label":"Overview","rows":[[{"name":"userName"},{"name":"isAdmin"}],[{"name":"defaultTeam"},{"name":"title","0":false}],[{"name":"name"}],[{"name":"email"},{"name":"phone"}]]}]