diff --git a/webapp/e2e/steps/register_negative_blank_password.steps.js b/webapp/e2e/steps/register_negative_blank_password.steps.js
index a665118e..d87613c1 100644
--- a/webapp/e2e/steps/register_negative_blank_password.steps.js
+++ b/webapp/e2e/steps/register_negative_blank_password.steps.js
@@ -36,7 +36,7 @@ defineFeature(feature, test => {
             await expect(page).toFill("input[id='user'", user);
             await expect(page).toFill("input[id='username'", username);
             await expect(page).toFill("#password", ""); // Blank password
-            await expect(page).toFill("input[id='field-:r5:']", password);
+            await expect(page).toFill("input[data-testid='repeat-password']", "");
             
         });
 
diff --git a/webapp/e2e/steps/register_negative_blank_repeated_password.steps.js b/webapp/e2e/steps/register_negative_blank_repeated_password.steps.js
index 61dd0b02..afac8c0f 100644
--- a/webapp/e2e/steps/register_negative_blank_repeated_password.steps.js
+++ b/webapp/e2e/steps/register_negative_blank_repeated_password.steps.js
@@ -37,7 +37,7 @@ defineFeature(feature, test => {
             await expect(page).toFill("input[id='user'", user);
             await expect(page).toFill("input[id='username'", username);
             await expect(page).toFill("#password", password); 
-            await expect(page).toFill("input[id='field-:r5:']", ""); // Blank password
+            await expect(page).toFill("input[data-testid='repeat-password']", ""); // Blank password
             
         });
 
diff --git a/webapp/e2e/steps/register_negative_blank_username.steps.js b/webapp/e2e/steps/register_negative_blank_username.steps.js
index cbd744ef..800db9e4 100644
--- a/webapp/e2e/steps/register_negative_blank_username.steps.js
+++ b/webapp/e2e/steps/register_negative_blank_username.steps.js
@@ -38,7 +38,7 @@ defineFeature(feature, test => {
             await expect(page).toFill("input[id='user'", user);
             await expect(page).toFill("input[id='username'", "");
             await expect(page).toFill("#password", password);
-            await expect(page).toFill("input[id='field-:r5:']", password);
+            await expect(page).toFill("input[data-testid='repeat-password']", password);
             
         });
 
diff --git a/webapp/e2e/steps/register_negative_email_already_in_use_form.steps.js b/webapp/e2e/steps/register_negative_email_already_in_use_form.steps.js
index c3049b88..a987dfae 100644
--- a/webapp/e2e/steps/register_negative_email_already_in_use_form.steps.js
+++ b/webapp/e2e/steps/register_negative_email_already_in_use_form.steps.js
@@ -45,7 +45,7 @@ defineFeature(feature, test => {
             await expect(page).toFill("input[id='user'", email);
             await expect(page).toFill("input[id='username'", username);
             await expect(page).toFill("#password", password);
-            await expect(page).toFill("input[id='field-:r5:']", password);
+            await expect(page).toFill("input[data-testid='repeat-password']", password);
             
         });
 
diff --git a/webapp/e2e/steps/register_negative_username_already_in_use_form.steps.js b/webapp/e2e/steps/register_negative_username_already_in_use_form.steps.js
index 83027a94..fc91df33 100644
--- a/webapp/e2e/steps/register_negative_username_already_in_use_form.steps.js
+++ b/webapp/e2e/steps/register_negative_username_already_in_use_form.steps.js
@@ -40,10 +40,10 @@ defineFeature(feature, test => {
 
         when("The user fills the data in the form using an already used username", async () => {
             await expect(page).toClick("span[class='chakra-link css-1bicqx'");
-            await expect(page).toFill("input[id='user'", user);
+            await expect(page).toFill("input[id='user'", user+"a");
             await expect(page).toFill("input[id='username'", username);
             await expect(page).toFill("#password", password);
-            await expect(page).toFill("input[id='field-:r5:']", password);
+            await expect(page).toFill("input[data-testid='repeat-password']", password);
             
         });
 
diff --git a/webapp/e2e/steps/register_negative_wrong_email_format.steps.js b/webapp/e2e/steps/register_negative_wrong_email_format.steps.js
index 664b17fe..5025b3af 100644
--- a/webapp/e2e/steps/register_negative_wrong_email_format.steps.js
+++ b/webapp/e2e/steps/register_negative_wrong_email_format.steps.js
@@ -36,7 +36,7 @@ defineFeature(feature, test => {
             await expect(page).toFill("input[id='user'", user);
             await expect(page).toFill("input[id='username'", username);
             await expect(page).toFill("#password", password); 
-            await expect(page).toFill("input[id='field-:r5:']", password);
+            await expect(page).toFill("input[data-testid='repeat-password']]", password);
             
         });
 
diff --git a/webapp/e2e/steps/register_positive_form.steps.js b/webapp/e2e/steps/register_positive_form.steps.js
index 8b708926..3e732eee 100644
--- a/webapp/e2e/steps/register_positive_form.steps.js
+++ b/webapp/e2e/steps/register_positive_form.steps.js
@@ -36,7 +36,7 @@ defineFeature(feature, test => {
             await expect(page).toFill("input[id='user'", userEmail);
             await expect(page).toFill("input[id='username'", userName);
             await expect(page).toFill("#password", password);
-            await expect(page).toFill("input[id='field-:r5:']", password);
+            await expect(page).toFill("input[data-testid='repeat-password']", password);
             
         });
 
diff --git a/webapp/src/pages/Signup.jsx b/webapp/src/pages/Signup.jsx
index f9d865fd..b73b1dd0 100644
--- a/webapp/src/pages/Signup.jsx
+++ b/webapp/src/pages/Signup.jsx
@@ -165,6 +165,7 @@ export default function Signup() {
                                 </InputLeftElement>
                                 <Input
                                     type={showConfirmPassword ? "text" : "password"}
+                                    data-testid={"repeat-password"}
                                     placeholder={t("session.confirm_password")}
                                     value={confirmPassword}
                                     onChange={handleConfirmPasswordChange}