diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt
index 70064c887d..c2323f2c3b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/EXAMPLE.tt
@@ -10,7 +10,7 @@
 <p>Hi, you are looking at the result of launching the EXAMPLE plugin.</p>
 <p>I received this from you:</p>
 <input type="text" id="received" value="[% result | html %]" disabled />
-<p/>
+</p>
 <p>I will pass back what you type here, if you press OK.</p>
 <input type="text" id="return" value="[% result | html %]" />
 <p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
index c960cf011a..6c76b1fa5b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
@@ -90,7 +90,7 @@
 
                                 <fieldset class="rows">
                                     <legend>Place article request from [% biblio.title | html %] for [% patron.firstname | html %] [% patron.surname | html %] ( [% patron.cardnumber | html %] )</legend>
-                                    <p/>
+                                    <p>
                                     <ul>
                                         <li>
                                             <label for="title">Title:</label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
index 4d9680e479..0448127e46 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt
@@ -89,7 +89,7 @@
                             <input type="hidden" name="id" value="[% p.id | html %]" />
                         [% END %]
 
-                        <p/>
+                        <br>
 
                         <input type="hidden" name="action" value="merge" />
                         <input id="merge-patrons" type="submit" value="Merge patrons" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
index 73d0a59f4c..8fdf30cf8e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
@@ -220,7 +220,7 @@
                                 </span>
                             </span>
 
-                            <p/>
+                            <br><br>
 
                             <select name="conditional" id="conditional" onchange="onConditionalChange(this);">
                                 <option value="" selected="selected" />
diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js
index 673494d3bf..3a4e129147 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/holds.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js
@@ -260,7 +260,7 @@ $(document).ready(function() {
                     <label for='suspend-modal-until'>" + __("Suspend until:") + "</label>\
                     <input name='suspend_until' id='suspend-modal-until' class='suspend-until' size='10' />\
 \
-                    <p/><a class='btn btn-link' id='suspend-modal-clear-date' >" + __("Clear date to suspend indefinitely") + "</a></p>\
+                    <p><a class='btn btn-link' id='suspend-modal-clear-date' >" + __("Clear date to suspend indefinitely") + "</a></p>\
 \
                 </div>\
 \