diff --git a/data/web/templates/admin/tab-config-identity-provider.twig b/data/web/templates/admin/tab-config-identity-provider.twig
index fd7a8dc81..02d5ca14c 100644
--- a/data/web/templates/admin/tab-config-identity-provider.twig
+++ b/data/web/templates/admin/tab-config-identity-provider.twig
@@ -58,8 +58,8 @@
           </div>
           {% for key, role in identity_provider_settings.mappers %}
           <div class="offset-sm-3 col-4 d-flex mb-2">
-            <input type="text" class="form-control me-2" name="mappers" value="{{ identity_provider_settings.mappers[key] }}">
-            <select data-live-search="true" name="templates" class="form-control" title="{{ lang.mailbox.template }}">
+            <input type="text" class="form-control me-2" name="mappers" value="{{ identity_provider_settings.mappers[key] }}" required>
+            <select data-live-search="true" name="templates" class="form-control" title="{{ lang.mailbox.template }}" required>
             {% for mbox_template in mbox_templates %}
               <option{% if mbox_template.template == identity_provider_settings.templates[key] %} selected{% endif %}>
                 {{ mbox_template.template }}
@@ -69,9 +69,10 @@
             <button class="iam_rolemap_del btn btn-sm d-block d-sm-inline btn-secondary ms-2"><i class="bi bi-x-lg"></i></button>
           </div>
           {% endfor %}
+          {% if not identity_provider_settings.mappers %}
           <div class="offset-sm-3 col-4 d-flex mb-2">
-            <input type="text" class="form-control me-2" name="mappers" value="">
-            <select data-live-search="true" name="templates" class="form-control" title="{{ lang.mailbox.template }}">
+            <input type="text" class="form-control me-2" name="mappers" value="" required>
+            <select data-live-search="true" name="templates" class="form-control" title="{{ lang.mailbox.template }}" required>
             {% for mbox_template in mbox_templates %}
               <option>
                 {{ mbox_template.template }}
@@ -80,6 +81,7 @@
             </select>
             <button class="iam_rolemap_del btn btn-sm d-block d-sm-inline btn-secondary ms-2"><i class="bi bi-x-lg"></i></button>
           </div>
+          {% endif %}
         </div>
         <div class="row mt-4 mb-2">
           <div class="offset-sm-3 col-sm-9">