diff --git a/src/constants/messages.ts b/src/constants/messages.ts
index bd48f96b..34e3c4d7 100644
--- a/src/constants/messages.ts
+++ b/src/constants/messages.ts
@@ -15,4 +15,4 @@ export const VALIDATE_PASSWORD_ERROR =
 export const CREATE_IDENTITY_ERROR =
   'Ha ocurrido un error intentando crear la cuenta ciudadana. Por favor, inténtelo más tarde.';
 export const NON_ACCEPTED_TERMS_AND_CONDS_ERROR =
-  'Para continuar, debe leer y aceptar los términos y políticas de privacidad.';
\ No newline at end of file
+  'Para continuar, debe leer y aceptar los términos y políticas de privacidad.';
diff --git a/src/pages/register/stepper/step3.tsx b/src/pages/register/stepper/step3.tsx
index c43013ac..02b46a71 100644
--- a/src/pages/register/stepper/step3.tsx
+++ b/src/pages/register/stepper/step3.tsx
@@ -126,7 +126,8 @@ export default function Step3({ handleNext, infoCedula }: any) {
         (n: any) => n.attributes['name'] === 'csrf_token'
       );
       const csrf_token = node?.attributes.value as string;
-      const surname = `${citizen.firstSurname} ${citizen.secondSurname}`;
+      // TODO: We need this later for `metadata_public` object
+      // const surname = `${citizen.firstSurname} ${citizen.secondSurname}`;
       const method = 'password';
 
       const updateRegistrationFlowBody: UpdateRegistrationFlowBody = {
@@ -137,7 +138,7 @@ export default function Step3({ handleNext, infoCedula }: any) {
           emails: [form.email],
           cedula: citizen.id,
           shortName: {
-            firstName: citizen.firstName,
+            firstName: citizen.name,
             firstSurname: citizen.firstSurname,
           },
         },