diff --git a/src/main/java/org/springframework/samples/petclinic/controller/UserController.java b/src/main/java/org/springframework/samples/petclinic/controller/UserController.java
index 512b5ae7c..45cd8bb0b 100644
--- a/src/main/java/org/springframework/samples/petclinic/controller/UserController.java
+++ b/src/main/java/org/springframework/samples/petclinic/controller/UserController.java
@@ -245,6 +245,7 @@ public class UserController extends WebSocketSender {
 	public String initUpdateOwnerForm(Model model) {
 		try {
 			UserDTO user = (UserDTO) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+			user = userService.findByEmail(user.getEmail());
 			model.addAttribute(CommonAttribute.USER, user);
 			model.addAttribute(CommonAttribute.USER_ID, user.getId());
 			return CommonView.USER_UPDATE;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index bb63d7ffe..e2c45f27e 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -44,15 +44,13 @@ spring.h2.console.path=/h2-console
 spring.security.oauth2.client.registration.google.client-id=${OAUTH2_GOOGLE_CLIENT_ID}
 spring.security.oauth2.client.registration.google.client-secret=${OAUTH2_GOOGLE_CLIENT_SECRET}
 
-spring.security.oauth2.client.registration.github.client-id=${OAUTH2_GITHUB_CLIENT_ID}
-spring.security.oauth2.client.registration.github.client-secret=${OAUTH2_GITHUB_CLIENT_SECRET}
+#spring.security.oauth2.client.registration.github.client-id=${OAUTH2_GITHUB_CLIENT_ID}
+#spring.security.oauth2.client.registration.github.client-secret=${OAUTH2_GITHUB_CLIENT_SECRET}
 
 
-#spring.security.oauth2.client.registration.facebook.client-id=<your client id>
-#spring.security.oauth2.client.registration.facebook.client-secret=<your client secret>
+spring.security.oauth2.client.registration.facebook.client-id=121189305185277
+spring.security.oauth2.client.registration.facebook.client-secret=42ffe5aa7379e8326387e0fe16f34132
 
-spring.security.oauth2.client.registration.twitter.client-id=${OAUTH2_TWITTER_CLIENT_ID}
-spring.security.oauth2.client.registration.twitter.client-secret=${OAUTH2_TWITTER_CLIENT_SECRET}
 
 #################################################################### SPRING MAIL
 spring.mail.host=smtp.mailtrap.io