diff --git a/mod/forum/templates/forum_discussion_nested_v2_first_post.mustache b/mod/forum/templates/forum_discussion_nested_v2_first_post.mustache
index 32b44d0905a..f9f81ab9084 100644
--- a/mod/forum/templates/forum_discussion_nested_v2_first_post.mustache
+++ b/mod/forum/templates/forum_discussion_nested_v2_first_post.mustache
@@ -77,7 +77,7 @@
             <header id="post-header-{{id}}-{{uniqid}}">
                 {{^isdeleted}}
                     <div class="d-flex flex-wrap align-items-center mb-1">
-                        <address class="mb-0 mr-2" tabindex="-1">
+                        <div class="mr-2" tabindex="-1">
                             {{#author}}
                                 <h4 class="h6 d-lg-inline-block mb-0 author-header mr-1">
                                     {{#parentauthorname}}
@@ -108,7 +108,7 @@
                             <time class="text-muted">
                                 {{#userdate}} {{timecreated}}, {{#str}} strftimerecentfull, core_langconfig {{/str}} {{/userdate}}
                             </time>
-                        </address>
+                        </div>
 
                         <div class="d-flex align-items-center ml-auto">
                             {{#author.groups}}
diff --git a/mod/forum/templates/forum_discussion_post.mustache b/mod/forum/templates/forum_discussion_post.mustache
index dad785c7538..f97101c90f3 100644
--- a/mod/forum/templates/forum_discussion_post.mustache
+++ b/mod/forum/templates/forum_discussion_post.mustache
@@ -76,14 +76,14 @@
                             }}>{{$subject}}{{{subject}}}{{/subject}}</h3>
                     {{/subjectheading}}
                     {{^isdeleted}}
-                        <address tabindex="-1">
+                        <div class="mb-3" tabindex="-1">
                             {{#html.authorsubheading}}{{{.}}}{{/html.authorsubheading}}
                             {{^html.authorsubheading}}
                                 <time>
                                     {{#userdate}} {{timecreated}}, {{#str}} strftimedaydatetime, core_langconfig {{/str}} {{/userdate}}
                                 </time>
                             {{/html.authorsubheading}}
-                        </address>
+                        </div>
                     {{/isdeleted}}
                     {{#isprivatereply}}
                         <div class="privatereplyinfo">
diff --git a/mod/forum/templates/forum_discussion_threaded_post.mustache b/mod/forum/templates/forum_discussion_threaded_post.mustache
index fd4c0346420..a4819dd8cd5 100644
--- a/mod/forum/templates/forum_discussion_threaded_post.mustache
+++ b/mod/forum/templates/forum_discussion_threaded_post.mustache
@@ -38,9 +38,7 @@
 >
     <a href="{{{urls.viewisolated}}}">{{subject}}</a>
     {{^isdeleted}}
-        <address class="d-inline-block mb-0">
-            {{{html.authorsubheading}}}
-        </address>
+        {{{html.authorsubheading}}}
     {{/isdeleted}}
 
     <div data-region="replies-container">