1 files changed, 15 insertions, 15 deletions
diff --git a/src/views/_sila/SecurityAndAccess/Certificates/ModalGenerateCsr.vue b/src/views/_sila/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
index 63258a40..2f2cb98f 100644
--- a/src/views/_sila/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
+++ b/src/views/_sila/SecurityAndAccess/Certificates/ModalGenerateCsr.vue
@@ -237,9 +237,9 @@
                 <b-col lg="6">
                   <b-form-group label-for="challenge-password">
                     <template #label>
-                      {{ $t('pageCertificates.modal.challengePassword') }} -
+                      {{ $t('pageCertificates.modal.challengePassword') }}
                       <span class="form-text d-inline">
-                        {{ $t('global.form.optional') }}
+                        {{ '*' }}
                       </span>
                     </template>
                     <b-form-input
@@ -255,9 +255,9 @@
                 <b-col lg="6">
                   <b-form-group label-for="contact-person">
                     <template #label>
-                      {{ $t('pageCertificates.modal.contactPerson') }} -
+                      {{ $t('pageCertificates.modal.contactPerson') }}
                       <span class="form-text d-inline">
-                        {{ $t('global.form.optional') }}
+                        {{ '*' }}
                       </span>
                     </template>
                     <b-form-input
@@ -271,9 +271,9 @@
                 <b-col lg="6">
                   <b-form-group label-for="email-address">
                     <template #label>
-                      {{ $t('pageCertificates.modal.emailAddress') }} -
+                      {{ $t('pageCertificates.modal.emailAddress') }}
                       <span class="form-text d-inline">
-                        {{ $t('global.form.optional') }}
+                        {{ '*' }}
                       </span>
                     </template>
                     <b-form-input
@@ -289,14 +289,16 @@
                 <b-col lg="12">
                   <b-form-group label-for="alternate-name">
                     <template #label>
-                      {{ $t('pageCertificates.modal.alternateName') }} -
+                      {{ $t('pageCertificates.modal.alternateName') }}
                       <span class="form-text d-inline">
-                        {{ $t('global.form.optional') }}
+                        {{ '*' }}
                       </span>
+                      <info-tooltip
+                        :title="
+                          $t('pageCertificates.modal.alternateNameHelperText')
+                        "
+                      />
                     </template>
-                    <b-form-text id="alternate-name-help-block">
-                      {{ $t('pageCertificates.modal.alternateNameHelperText') }}
-                    </b-form-text>
                     <b-form-tags
                       v-model="form.alternateName"
                       :remove-on-delete="true"
@@ -304,9 +306,6 @@
                       input-id="alternate-name"
                       size="lg"
                       separator=" "
-                      :input-attrs="{
-                        'aria-describedby': 'alternate-name-help-block',
-                      }"
                       :duplicate-tag-text="
                         $t('pageCertificates.modal.duplicateAlternateName')
                       "
@@ -377,12 +376,13 @@ import { required, requiredIf } from 'vuelidate/lib/validators';
 
 import { COUNTRY_LIST } from './CsrCountryCodes';
 import { CERTIFICATE_TYPES } from '@/store/modules/SecurityAndAccess/CertificatesStore';
+import InfoTooltip from '@/components/_sila/Global/InfoTooltip';
 import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
 import VuelidateMixin from '@/components/_sila/Mixins/VuelidateMixin.js';
 
 export default {
   name: 'ModalGenerateCsr',
-  components: { IconAdd, IconCheckmark },
+  components: { IconAdd, IconCheckmark, InfoTooltip },
   mixins: [BVToastMixin, VuelidateMixin],
   data() {
     return {