diff --git a/src/main/java/org/gcube/portal/invites/InvitesManager.java b/src/main/java/org/gcube/portal/invites/InvitesManager.java
index 8a9b2af..923132e 100644
--- a/src/main/java/org/gcube/portal/invites/InvitesManager.java
+++ b/src/main/java/org/gcube/portal/invites/InvitesManager.java
@@ -82,7 +82,7 @@ public class InvitesManager {
 		GCubeUser currUser = PortalContext.getConfiguration().getCurrentUser(request);
 		String username = currUser.getUsername();
 		String fromFullName = currUser.getFullname();
-		String controlcode = UUID.randomUUID().toString();
+		String controlcode = GenerateSecurePassword.generatePassword(RANDOM_PASSWD_LENGTH);
 		String currScope =  PortalContext.getConfiguration().getCurrentScope(request);
 
 		Invite invite = new Invite(UUID.randomUUID().toString(), username, currScope, email, controlcode, InviteStatus.PENDING, new Date(), fromFullName); 
@@ -152,7 +152,7 @@ public class InvitesManager {
 					.append("?")
 					.append(getParamsEncoded);
 
-			String randomPasswd = "";
+		
 			if (accountExists) {
 				EmailTemplateService.send(
 						subject, 
@@ -161,10 +161,10 @@ public class InvitesManager {
 						new Recipient(email), new Recipient(new EmailAddress(currUser.getEmail()), RecipientType.CC));
 			} 
 			else { //the user account does not exists yet, it needs to be created on KC and a random pwd to be sent to the user in the email
-				randomPasswd = GenerateSecurePassword.generatePassword(RANDOM_PASSWD_LENGTH);
+			
 				EmailTemplateService.send(
 						subject, 
-						new TemplatenviteWIthPassword(gatewayName, gatewayURL, currUser, name, vreName, vreDescription, linkToAcceptInvite.toString(), randomPasswd), 
+						new TemplatenviteWIthPassword(gatewayName, gatewayURL, currUser, name, vreName, vreDescription, linkToAcceptInvite.toString(), invite.getControlCode()), 
 						request,
 						new Recipient(email), new Recipient(new EmailAddress(currUser.getEmail()), RecipientType.CC));
 			}