diff --git a/theme/base/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig b/theme/base/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig
index 8c5d038aa..1f7387819 100644
--- a/theme/base/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig
+++ b/theme/base/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig
@@ -5,4 +5,4 @@
 {% block title %}{{ parent() }}{% endblock %}
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
-{% block errorMessage %}<p>{{ 'error_metadata_entity_id_not_found_desc'|trans({'%message%': message}) }}</p>{% endblock %}
+{% block errorMessage %}{{ 'error_metadata_entity_id_not_found_desc'|trans({'%message%': message}) }}{% endblock %}
diff --git a/theme/base/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig b/theme/base/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig
index 3fe466c4c..f070a9c8b 100644
--- a/theme/base/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig
+++ b/theme/base/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig
@@ -6,6 +6,7 @@
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
 {% block errorMessage %}
+    <p>
     {% if withIdpName and withSpName %}
         {{ 'error_missing_required_fields_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName'], '%spName%': feedbackInfoMap['serviceProviderName']}) }}
     {% elseif withIdpName %}
@@ -15,6 +16,7 @@
     {% else %}
         {{ 'error_missing_required_fields_desc_no_name'|trans }}
     {% endif %}
+    </p>
 
     <p>
         <ul>
diff --git a/theme/base/templates/modules/Authentication/View/Feedback/no-authentication-request-received.html.twig b/theme/base/templates/modules/Authentication/View/Feedback/no-authentication-request-received.html.twig
index 71f652d1d..6489b6e1a 100644
--- a/theme/base/templates/modules/Authentication/View/Feedback/no-authentication-request-received.html.twig
+++ b/theme/base/templates/modules/Authentication/View/Feedback/no-authentication-request-received.html.twig
@@ -5,4 +5,4 @@
 {% block title %}{{ parent() }}{% endblock %}
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
-{% block errorMessage %}<p>{{ message }}.</p>{% endblock %}
+{% block errorMessage %}{{ message }}{% endblock %}
diff --git a/theme/base/templates/modules/Authentication/View/IdentityProvider/perform-request-access.html.twig b/theme/base/templates/modules/Authentication/View/IdentityProvider/perform-request-access.html.twig
index 921ce87d6..f10baa79d 100644
--- a/theme/base/templates/modules/Authentication/View/IdentityProvider/perform-request-access.html.twig
+++ b/theme/base/templates/modules/Authentication/View/IdentityProvider/perform-request-access.html.twig
@@ -3,7 +3,7 @@
 {% block content %}
 <div class="mod-form">
   <h1>{{ 'send_confirm'|trans }}</h1>
-    {{ 'send_confirm_desc'|trans }}
+  <p>{{ 'send_confirm_desc'|trans }}</p>
 
   <div class="close-modal-container">
     <button type="button" class="c-button close-modal">{{ 'close'|trans }}</button>
diff --git a/theme/openconext/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig b/theme/openconext/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig
index d112395b4..d6a1014c0 100644
--- a/theme/openconext/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig
+++ b/theme/openconext/templates/modules/Authentication/View/Feedback/metadata-entity-not-found.html.twig
@@ -5,4 +5,4 @@
 {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %}
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
-{% block errorMessage %}<p>{{ 'error_metadata_entity_id_not_found_desc'|trans({'%message%': message}) }}</p>{% endblock %}
+{% block errorMessage %}{{ 'error_metadata_entity_id_not_found_desc'|trans({'%message%': message}) }}{% endblock %}
diff --git a/theme/openconext/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig b/theme/openconext/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig
index 09f72cefe..96caff29b 100644
--- a/theme/openconext/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig
+++ b/theme/openconext/templates/modules/Authentication/View/Feedback/missing-required-fields.html.twig
@@ -6,6 +6,7 @@
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
 {% block errorMessage %}
+    <p>
     {% if withIdpName and withSpName %}
         {{ 'error_missing_required_fields_desc'|trans({'%idpName%': feedbackInfoMap['identityProviderName'], '%spName%': feedbackInfoMap['serviceProviderName']}) }}
     {% elseif withIdpName %}
@@ -15,6 +16,7 @@
     {% else %}
         {{ 'error_missing_required_fields_desc_no_name'|trans }}
     {% endif %}
+    </p>
 
     <p>
         <ul>
diff --git a/theme/openconext/templates/modules/Authentication/View/Feedback/no-authentication-request-received.html.twig b/theme/openconext/templates/modules/Authentication/View/Feedback/no-authentication-request-received.html.twig
index 045986e00..dc9dd2cfb 100644
--- a/theme/openconext/templates/modules/Authentication/View/Feedback/no-authentication-request-received.html.twig
+++ b/theme/openconext/templates/modules/Authentication/View/Feedback/no-authentication-request-received.html.twig
@@ -5,4 +5,4 @@
 {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %}
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
-{% block errorMessage %}<p>{{ message }}.</p>{% endblock %}
+{% block errorMessage %}{{ message }}{% endblock %}
diff --git a/theme/openconext/templates/modules/Authentication/View/Feedback/received-error-status-code.html.twig b/theme/openconext/templates/modules/Authentication/View/Feedback/received-error-status-code.html.twig
index 1865b1429..4d42a47b1 100644
--- a/theme/openconext/templates/modules/Authentication/View/Feedback/received-error-status-code.html.twig
+++ b/theme/openconext/templates/modules/Authentication/View/Feedback/received-error-status-code.html.twig
@@ -5,4 +5,4 @@
 {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %}
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
-{% block errorMessage %}<p>{{ 'error_received_error_status_code_desc'|trans }}</p>{% endblock %}
+{% block errorMessage %}{{ 'error_received_error_status_code_desc'|trans }}{% endblock %}
diff --git a/theme/openconext/templates/modules/Authentication/View/Feedback/unknown-requesterid-in-authnrequest.html.twig b/theme/openconext/templates/modules/Authentication/View/Feedback/unknown-requesterid-in-authnrequest.html.twig
index b1e2df168..992ed8dac 100644
--- a/theme/openconext/templates/modules/Authentication/View/Feedback/unknown-requesterid-in-authnrequest.html.twig
+++ b/theme/openconext/templates/modules/Authentication/View/Feedback/unknown-requesterid-in-authnrequest.html.twig
@@ -5,4 +5,4 @@
 {% block title %}{{ parent() }} - {{ pageTitle }} {% endblock %}
 {% block pageHeading %}{{ pageTitle }}{% endblock %}
 
-{% block errorMessage %}<p>{{ 'error_unknown_requesterid_in_authnrequest'|trans }}</p>{% endblock %}
+{% block errorMessage %}{{ 'error_unknown_requesterid_in_authnrequest'|trans }}{% endblock %}