diff --git a/src/main/java/org/springframework/samples/petclinic/controller/PetController.java b/src/main/java/org/springframework/samples/petclinic/controller/PetController.java
index b49786ccd..b1bcec754 100644
--- a/src/main/java/org/springframework/samples/petclinic/controller/PetController.java
+++ b/src/main/java/org/springframework/samples/petclinic/controller/PetController.java
@@ -125,7 +125,7 @@ class PetController extends WebSocketSender {
 			return CommonView.PET_CREATE_OR_UPDATE;
 		}
 		else {
-			owner.addPet(pet);
+			pet.setOwner(owner);
 			this.petService.save(pet);
 			sendSuccessMessage(CommonWebSocket.PET_UPDATED);
 			return CommonView.OWNER_OWNERS_ID_R;
diff --git a/src/main/java/org/springframework/samples/petclinic/service/business/PetService.java b/src/main/java/org/springframework/samples/petclinic/service/business/PetService.java
index 82c43182b..a7e205959 100644
--- a/src/main/java/org/springframework/samples/petclinic/service/business/PetService.java
+++ b/src/main/java/org/springframework/samples/petclinic/service/business/PetService.java
@@ -123,7 +123,9 @@ public class PetService implements BaseService<Pet, PetDTO> {
 	@Override
 	public PetDTO save(PetDTO petDTO) {
 		Pet pet = dtoToEntity(petDTO);
+		Owner owner = pet.getOwner();
 		pet = petRepository.save(pet);
+		pet.setOwner(owner);
 
 		return entityToDTO(pet);
 	}
diff --git a/src/main/resources/templates/fragments/inputField.html b/src/main/resources/templates/fragments/inputField.html
index 0de081939..2ed3dac2c 100644
--- a/src/main/resources/templates/fragments/inputField.html
+++ b/src/main/resources/templates/fragments/inputField.html
@@ -11,6 +11,7 @@
                 <input th:case="'text'" class="form-control" type="text" th:field="*{__${name}__}" />
                 <input th:case="'password'" class="form-control" type="password" th:field="*{__${name}__}" />
               <input th:case="'email'" class="form-control" type="email" th:field="*{__${name}__}" />
+              <input th:case="'emaildisabled'" class="form-control" type="email" th:field="*{__${name}__}" disabled/>
                 <input th:case="'date'" class="form-control" type="text" th:field="*{__${name}__}"
                         placeholder="YYYY-MM-DD" title="Enter a date in this format: YYYY-MM-DD"
                         pattern="(?:19|20)[0-9]{2}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-9])|(?:(?!02)(?:0[1-9]|1[0-2])-(?:30))|(?:(?:0[13578]|1[02])-31))"/>
diff --git a/src/main/resources/templates/users/userUpdateForm.html b/src/main/resources/templates/users/userUpdateForm.html
index 5fef33bb4..3b5395f0b 100644
--- a/src/main/resources/templates/users/userUpdateForm.html
+++ b/src/main/resources/templates/users/userUpdateForm.html
@@ -6,6 +6,7 @@
   <h2>User update</h2>
   <form th:object="${user}" class="form-horizontal" id="add-user-form" method="post">
     <input type="hidden"  th:field="${user.id}" />
+    <input type="hidden"  th:field="${user.email}" />
     <input type="hidden"  th:field="${user.password}" />
     <input type="hidden"  th:field="${user.matchingPassword}" />
     <input type="hidden"  th:field="${user.enabled}" />
@@ -17,7 +18,7 @@
 
     <div class="form-group has-feedback">
       <input
-        th:replace="~{fragments/inputField :: input ('Email', 'email', 'email')}" disabled />
+        th:replace="~{fragments/inputField :: input ('Email', 'email', 'emaildisabled')}"  />
       <input
         th:replace="~{fragments/inputField :: input ('First Name', 'firstName', 'text')}" />
       <input