diff --git a/src/main/java/it/enea/xlab/GECORegistration/controller/DataController.java b/src/main/java/it/enea/xlab/GECORegistration/controller/DataController.java
index b814b2994e831870f59e732b87c111eb39f0be71..aaa886d15d977bd1631cf8dffde8d7485b7136a6 100644
--- a/src/main/java/it/enea/xlab/GECORegistration/controller/DataController.java
+++ b/src/main/java/it/enea/xlab/GECORegistration/controller/DataController.java
@@ -120,8 +120,8 @@ public class DataController {
 	@Autowired
 	IIdpClientManager idpClientManager;
 
-	@Autowired
-	IEncryptionManager encryptionManager;
+	//@Autowired
+	//IEncryptionManager encryptionManager;
 	
 	@Autowired
 	DTOManager dtoManager;
@@ -289,7 +289,8 @@ public class DataController {
 		log.info("Token: " + token);
 		if (idpClientManager.isValid(token)) {
 			UserDto userdto = idpClientManager.getUserFromToken(token);
-			String subject = encryptionManager.encrypt(userdto.getEmail());
+			String subject = userdto.getUuid();
+			//		encryptionManager.encrypt(userdto.getEmail());
 			user = userInterface.findBySubject(subject);
 			
 			}
@@ -340,7 +341,8 @@ public class DataController {
 		log.info("Token: " + token);
 		if (idpClientManager.isValid(token)) {
 			UserDto userdto = idpClientManager.getUserFromToken(token);
-			String subject = encryptionManager.encrypt(userdto.getEmail());
+			String subject = userdto.getUuid();
+					//encryptionManager.encrypt(userdto.getEmail());
 			user = userInterface.findBySubject(subject);
 			
 			}
diff --git a/src/main/java/it/enea/xlab/GECORegistration/controller/MailController.java b/src/main/java/it/enea/xlab/GECORegistration/controller/MailController.java
index d060189e2deb5fadd360933d09b7d7aa78ca08f4..3c10ce7201c246db88ef41fc5c4e92b308ffcff3 100644
--- a/src/main/java/it/enea/xlab/GECORegistration/controller/MailController.java
+++ b/src/main/java/it/enea/xlab/GECORegistration/controller/MailController.java
@@ -57,8 +57,8 @@ public class MailController {
 	@NonNull
 	NewUserInterface userInterface;
 	
-	@NonNull
-	IEncryptionManager encryptionManager;
+	//@NonNull
+	//IEncryptionManager encryptionManager;
 
 	@Value("${activationLink}")
 	private String activationLink;