diff --git a/jsf/src/main/java/es/uvigo/esei/xcs/jsf/PetManagedBean.java b/jsf/src/main/java/es/uvigo/esei/xcs/jsf/PetManagedBean.java
index 2af457972a183799bfbfe60ea74596eb1623a410..933c67f18ad5547e6a79473911d13e57c1048939 100644
--- a/jsf/src/main/java/es/uvigo/esei/xcs/jsf/PetManagedBean.java
+++ b/jsf/src/main/java/es/uvigo/esei/xcs/jsf/PetManagedBean.java
@@ -77,7 +77,9 @@ public class PetManagedBean {
 		return this.service.list();
 	}
 	
-	public String edit(Pet pet) {
+	public String edit(int petId) {
+		final Pet pet = this.service.get(petId);
+		
 		this.id = pet.getId();
 		this.name = pet.getName();
 		this.birth = pet.getBirth();
diff --git a/jsf/src/main/webapp/admin/owners.xhtml b/jsf/src/main/webapp/admin/owners.xhtml
index 55e5e89f6f7ea802f0cc03e971b83db8641c3539..050be53cc1617a8745817b408035cf4c546e951c 100644
--- a/jsf/src/main/webapp/admin/owners.xhtml
+++ b/jsf/src/main/webapp/admin/owners.xhtml
@@ -32,26 +32,26 @@
 			</ui:define>
 			<ui:define name="content">
 				<h:dataTable id="owners-table"
-					value="#{owner.owners}" var="c"
+					value="#{owner.owners}" var="ownerEntity"
 					styleClass="table table-striped table-bordered"
 					columnClasses="owners-table-login,owners-table-password,owners-table-pets,owners-table-options"
 				>
 					<h:column>
 						<f:facet name="header">Login</f:facet>
-						#{c.login}
+						#{ownerEntity.login}
 					</h:column>
 					<h:column>
 						<f:facet name="header">Password</f:facet>
-						#{c.password}
+						#{ownerEntity.password}
 					</h:column>
 					<h:column>
 						<f:facet name="header">Pets</f:facet>
-						#{owner.getPetNames(c.login)}
+						#{owner.getPetNames(ownerEntity.login)}
 					</h:column>
 					<h:column>
 						<h:form>
-							<h:commandButton class="owners-table-remove" value="Remove" action="#{owner.remove(c.login)}"/>
-							<h:commandButton class="owners-table-edit" value="Edit" action="#{owner.edit(c.login)}"/>
+							<h:commandButton class="owners-table-remove" value="Remove" action="#{owner.remove(ownerEntity.login)}"/>
+							<h:commandButton class="owners-table-edit" value="Edit" action="#{owner.edit(ownerEntity.login)}"/>
 						</h:form>
 					</h:column>
 				</h:dataTable>
diff --git a/jsf/src/main/webapp/owner/pets.xhtml b/jsf/src/main/webapp/owner/pets.xhtml
index 78a06a3092c11b08dd85fe4c15e4e0c74454a458..489e0aa0b298f96dca709a472957bf7e60d31b0c 100644
--- a/jsf/src/main/webapp/owner/pets.xhtml
+++ b/jsf/src/main/webapp/owner/pets.xhtml
@@ -36,25 +36,25 @@
 				</div>
 		</ui:define>
 			<ui:define name="content">
-				<h:dataTable value="#{pet.pets}" var="p" styleClass="table table-striped table-bordered">
+				<h:dataTable value="#{pet.pets}" var="petEntity" styleClass="table table-striped table-bordered">
 					<h:column>
 						<f:facet name="header">Name</f:facet>
-						#{p.name}
+						#{petEntity.name}
 					</h:column>
 					<h:column>
 						<f:facet name="header">Birth</f:facet>
-						<h:outputText value="#{p.birth}">
+						<h:outputText value="#{petEntity.birth}">
 							<f:convertDateTime pattern="yyyy-M-d hh:mm:ss" />
 						</h:outputText>
 					</h:column>
 					<h:column>
 						<f:facet name="header">Type</f:facet>
-						#{p.animal}
+						#{petEntity.animal}
 					</h:column>
 					<h:column>
 						<h:form>
-							<h:commandButton value="Remove" type="submit" action="#{pet.remove(p.id)}"/>
-							<h:commandButton value="Edit" action="#{pet.edit(p)}"/>
+							<h:commandButton value="Remove" type="submit" action="#{pet.remove(petEntity.id)}"/>
+							<h:commandButton value="Edit" action="#{pet.edit(petEntity.id)}"/>
 						</h:form>
 					</h:column>
 				</h:dataTable>