diff --git a/src/dev/peerat/backend/routes/users/MailConfirmation.java b/src/dev/peerat/backend/routes/users/MailConfirmation.java
index 66243c1..81eb7f9 100644
--- a/src/dev/peerat/backend/routes/users/MailConfirmation.java
+++ b/src/dev/peerat/backend/routes/users/MailConfirmation.java
@@ -155,6 +155,7 @@ public class MailConfirmation extends FormResponse{
 	}
 	
 	private Constructor<?> uuidBuilder;
+	private int[] start = {4, 9, 14, 19};
 	
 	private String codeGenerator() throws Exception{
 		Random random = new Random();
@@ -165,7 +166,11 @@ public class MailConfirmation extends FormResponse{
 	    arrayOfByte[6] = (byte)(arrayOfByte[6] | 0x40);
 	    arrayOfByte[8] = (byte)(arrayOfByte[8] & 0x3F);
 	    arrayOfByte[8] = (byte)(arrayOfByte[8] | 0x80);
-	    return uuidBuilder.newInstance(arrayOfByte).toString();
+	    String uuid = uuidBuilder.newInstance(arrayOfByte).toString();
+	    target = this.randoms.get(random.nextInt(this.randoms.size()));
+	    
+	    int start = this.start[target.nextInt(this.start.length)];
+	    return uuid.substring(start, start+9);
 	}
 	
 	private void createFolderToSaveSourceCode(String pseudo) throws IOException {
diff --git a/src/dev/peerat/backend/routes/users/Register.java b/src/dev/peerat/backend/routes/users/Register.java
index c5e8cff..c9976dc 100644
--- a/src/dev/peerat/backend/routes/users/Register.java
+++ b/src/dev/peerat/backend/routes/users/Register.java
@@ -83,6 +83,7 @@ public class Register extends FormResponse{
 	}
 	
 	private Constructor<?> uuidBuilder;
+	private int[] start = {4, 9, 14, 19};
 	
 	private String codeGenerator() throws Exception{
 		Random random = new Random();
@@ -93,7 +94,11 @@ public class Register extends FormResponse{
 	    arrayOfByte[6] = (byte)(arrayOfByte[6] | 0x40);
 	    arrayOfByte[8] = (byte)(arrayOfByte[8] & 0x3F);
 	    arrayOfByte[8] = (byte)(arrayOfByte[8] | 0x80);
-	    return uuidBuilder.newInstance(arrayOfByte).toString();
+	    String uuid = uuidBuilder.newInstance(arrayOfByte).toString();
+	    target = this.randoms.get(random.nextInt(this.randoms.size()));
+	    
+	    int start = this.start[target.nextInt(this.start.length)];
+	    return uuid.substring(start, start+9);
 	}
 	
 }