diff --git a/src/store/modules/SecurityAndAccess/CertificatesStore.js b/src/store/modules/SecurityAndAccess/CertificatesStore.js
index 3583d7f..666f5fd 100644
--- a/src/store/modules/SecurityAndAccess/CertificatesStore.js
+++ b/src/store/modules/SecurityAndAccess/CertificatesStore.js
@@ -166,7 +166,6 @@
         keyPairAlgorithm,
         keyBitLength,
         keyCurveId,
-        challengePassword,
         contactPerson,
         emailAddress,
         alternateName,
@@ -187,7 +186,6 @@
 
       if (keyCurveId) data.KeyCurveId = keyCurveId;
       if (keyBitLength) data.KeyBitLength = keyBitLength;
-      if (challengePassword) data.ChallengePassword = challengePassword;
       if (contactPerson) data.ContactPerson = contactPerson;
       if (emailAddress) data.Email = emailAddress;
 
diff --git a/src/views/SecurityAndAccess/Certificates/ModalGenerateCsr.vue b/src/views/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
index 04d23d2..d9d6591 100644
--- a/src/views/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
+++ b/src/views/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
@@ -155,24 +155,6 @@
                   </b-form-group>
                 </b-col>
                 <b-col lg="6">
-                  <b-form-group label-for="challenge-password">
-                    <template #label>
-                      {{ $t('pageCertificates.modal.challengePassword') }} -
-                      <span class="form-text d-inline">
-                        {{ $t('global.form.optional') }}
-                      </span>
-                    </template>
-                    <b-form-input
-                      id="challenge-password"
-                      v-model="form.challengePassword"
-                      type="text"
-                      data-test-id="modalGenerateCsr-input-challengePassword"
-                    />
-                  </b-form-group>
-                </b-col>
-              </b-row>
-              <b-row>
-                <b-col lg="6">
                   <b-form-group label-for="contact-person">
                     <template #label>
                       {{ $t('pageCertificates.modal.contactPerson') }} -
@@ -188,6 +170,8 @@
                     />
                   </b-form-group>
                 </b-col>
+              </b-row>
+              <b-row>
                 <b-col lg="6">
                   <b-form-group label-for="email-address">
                     <template #label>
@@ -400,7 +384,6 @@
         companyName: null,
         companyUnit: null,
         commonName: null,
-        challengePassword: null,
         contactPerson: null,
         emailAddress: null,
         alternateName: [],
@@ -436,7 +419,6 @@
       companyName: { required },
       companyUnit: { required },
       commonName: { required },
-      challengePassword: {},
       contactPerson: {},
       emailAddress: {},
       alternateName: {},