Index: sandbox/2.4.1-3/prototype/rest/catalog/ContactResource.php
===================================================================
--- sandbox/2.4.1-3/prototype/rest/catalog/ContactResource.php	(revision 6437)
+++ sandbox/2.4.1-3/prototype/rest/catalog/ContactResource.php	(revision 6460)
@@ -99,5 +99,5 @@
 		$d = new Data();
 		$d->setName('email');
-		$d->setValue($value['email']);
+		$d->setValue($contact[0]['email']);
 		$d->setPrompt('Email do Contato');
 		$d->setDataType('string');
@@ -110,5 +110,5 @@
 		$d = new Data();
 		$d->setName('telephone');
-		$d->setValue($value['telephone']);
+		$d->setValue($contact[0]['telephone']);
 		$d->setPrompt('Telefone do Contato');
 		$d->setDataType('string');
Index: sandbox/2.4.1-3/prototype/rest/user/UserResource.php
===================================================================
--- sandbox/2.4.1-3/prototype/rest/user/UserResource.php	(revision 6429)
+++ sandbox/2.4.1-3/prototype/rest/user/UserResource.php	(revision 6460)
@@ -35,132 +35,106 @@
 	    //Se nao foi encontrado usuario na consulta
 	    if($user===false){
-		$error = new Error();
-		$error->setCode(Response::NOTFOUND);
-		$error->setTitle('UserLDAP not found');
-		$error->setDescription('User not found.');
+			$error = new Error();
+			$error->setCode(Response::NOTFOUND);
+			$error->setTitle('UserLDAP not found');
+			$error->setDescription('User not found.');
 
-		$c->setError($error);
-		$h->setCollection($c);
+			$c->setError($error);
+			$h->setCollection($c);
 
-		$response->code = Response::NOTFOUND;
-		$response->body = $h->getHypermedia($request->accept[10][0]);
-		return $response;
+			$response->code = Response::NOTFOUND;
+			$response->body = $h->getHypermedia($request->accept[10][0]);
+			return $response;
 	    }
 
-            foreach($user as $value){
+		$t = new Template();
 		$d = new Data();
-                $i = new Item($request->resources, 'UserResource', $value['uid']);
 
 		$d->setName('name');
-                $d->setValue($value['name']);
-                $d->setPrompt('Nome do Usuário');
-                $d->setDataType('string');
-                $d->setMaxLength('100');
-                $d->setMinLength(null);
-                $d->setRequired(true);
+		$d->setValue(null);
+		$d->setPrompt('Nome do Usuário');
+		$d->setDataType('string');
+		$d->setMaxLength(100);
+		$d->setMinLength(null);
+		$d->setRequired(true);
 
-                $i->addData($d);
+		$t->addData($d);
+		$d = new Data();
+
+		$d->setName('email');
+		$d->setValue(null);
+		$d->setPrompt('Email do Usuário');
+		$d->setDataType('string');
+		$d->setMaxLength(100);
+		$d->setMinLength(null);
+		$d->setRequired(true);
+
+		$t->addData($d);
 
 		$d = new Data();
-                $d->setName('email');
-                $d->setValue($value['mail']);
-                $d->setPrompt('Email do Usuário');
-                $d->setDataType('string');
-                $d->setMaxLength('100');
-                $d->setMinLength(null);
-                $d->setRequired(true);
+		$d->setName('telefone');
+		$d->setValue(null);
+		$d->setPrompt('Telefone do Usuário');
+		$d->setDataType('string');
+		$d->setMaxLength(100);
+		$d->setMinLength(null);
+		$d->setRequired(true);
 
-                $i->addData($d);
+		$t->addData($d);
 
-                $d = new Data();
-                $d->setName('telephoneNumber');
-                $d->setValue($value['telephoneNumber']);
-                $d->setPrompt('Telefone do Usuário');
-                $d->setDataType('string');
-                $d->setMaxLength('100');
-                $d->setMinLength(null);
-                $d->setRequired(true);
+		$c->setTemplate($t);
+		
+		$d = new Data();
+		$d->setName('name');
+		$d->setValue($user[0]['name']);
+		$d->setPrompt('Nome do Usuário');
+		$d->setDataType('string');
+		$d->setMaxLength('100');
+		$d->setMinLength(null);
+		$d->setRequired(true);
 
-                $i->addData($d);
+		$c->addData($d);
+		
+		$d = new Data();
+		$d->setName('email');
+		$d->setValue($user[0]['mail']);
+		$d->setPrompt('Email do Usuário');
+		$d->setDataType('string');
+		$d->setMaxLength('100');
+		$d->setMinLength(null);
+		$d->setRequired(true);
+		
+		$c->addData($d);
+		
+		$d = new Data();
+		$d->setName('telephoneNumber');
+		$d->setValue($user[0]['telephoneNumber']);
+		$d->setPrompt('Telefone do Usuário');
+		$d->setDataType('string');
+		$d->setMaxLength('100');
+		$d->setMinLength(null);
+		$d->setRequired(true);
+			
+		$c->addData($d);
+		
+		$l = new Link();
+		$l->setHref('');
+		$l->setRel('delete');
+		$l->setAlt('Remover');
+		$l->setPrompt('Remover');
+		$l->setRender('link');
 
-                $l = new Link();
+		$c->addLink($l);
 
-                $l->setHref('');
-                $l->setRel('delete');
-                $l->setAlt('Remover');
-                $l->setPrompt('Remover');
-                $l->setRender('link');
+		$l = new Link();
+		$l->setHref('');
+		$l->setRel('put');
+		$l->setAlt('Atualizar');
+		$l->setPrompt('Atualizar');
+		$l->setRender('link');
 
-                $i->addLink($l);
+		$c->addLink($l);
 
-                $l = new Link();
-                $l->setHref('');
-                $l->setRel('put');
-                $l->setAlt('Atualizar');
-                $l->setPrompt('Atualizar');
-                $l->setRender('link');
-
-                $i->addLink($l);
-
-                $l = new Link();
-                $l->setHref($i->getHref());
-                $l->setRel('get');
-                $l->setAlt('Buscar');
-                $l->setPrompt('Buscar');
-                $l->setRender('link');
-
-                $i->addLink($l);
-                $c->addItem($i);
-	    }
-
-            $t = new Template();
-            $d = new Data();
-
-            $d->setName('name');
-            $d->setValue(null);
-            $d->setPrompt('Nome do Usuário');
-            $d->setDataType('string');
-            $d->setMaxLength(100);
-            $d->setMinLength(null);
-            $d->setRequired(true);
-
-            $t->addData($d);
-            $d = new Data();
-
-            $d->setName('email');
-            $d->setValue(null);
-            $d->setPrompt('Email do Usuário');
-            $d->setDataType('string');
-            $d->setMaxLength(100);
-            $d->setMinLength(null);
-            $d->setRequired(true);
-
-            $t->addData($d);
-
-            $d = new Data();
-            $d->setName('telefone');
-            $d->setValue(null);
-            $d->setPrompt('Telefone do Usuário');
-            $d->setDataType('string');
-            $d->setMaxLength(100);
-            $d->setMinLength(null);
-            $d->setRequired(true);
-
-            $t->addData($d);
-
-            $c->setTemplate($t);
-            $d = new Data();
-
-            $d->setName('Usuário LDAP');
-            $d->setValue(null);
-            $d->setPrompt('Usuário do LDAP');
-            $d->setDataType(null);
-            $d->setMaxLength(null);
-            $d->setMinLength(null);
-            $d->setRequired(null);
-
-            $c->addData($d);
-
-            $h->setCollection($c);
+		$h->setCollection($c);
 
 	}catch (Exception $ex){
