diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/misc.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/misc.less
index cf7be2d9aeb1..bae6a6f9e586 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/misc.less
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/misc.less
@@ -219,6 +219,8 @@ div.suggestItems .hide-button {
     display: flex;
     flex-flow: row wrap;
     gap: 1em;
+    /* Same as `.xform dl dt` */
+    margin-top: floor(@font-size-base * 1.4);
   }
 }
 
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/login.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/login.vm
index d48dadfd32da..b95940ee20c7 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/login.vm
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/login.vm
@@ -85,19 +85,19 @@
       $supplementaryForm
     </div>
   #end
-  <dt class="submitSection">
-    <input type="submit" class="btn btn-primary col-xs-12" value="$escapetool.xml($services.localization.render('login'))"/>
+  </dl>
+<div class="submitSection">
+  <input type="submit" class="btn btn-primary col-xs-12" value="$escapetool.xml($services.localization.render('login'))"/>
 
-    #set ($forgotUsernameURL = $services.security.authentication.getAuthenticationURL('retrieveusername', $NULL))
-    #if("$!forgotUsernameURL" != "")
-      <span class="xAdditional"><a href="$forgotUsernameURL">$escapetool.xml($services.localization.render('xe.admin.forgotUsername.loginMessage'))</a></span>
-    #end
-    #set ($resetPasswordUrl = $services.security.authentication.getAuthenticationURL('resetpassword', $NULL))
-    #if("$!resetPasswordUrl" != '')
-      <span class="xAdditional recoverPassword"><a href="$resetPasswordUrl" >$escapetool.xml($services.localization.render('xe.admin.passwordReset.loginMessage'))</a></span>
-    #end
-  </dt>
-</dl>
+  #set ($forgotUsernameURL = $services.security.authentication.getAuthenticationURL('retrieveusername', $NULL))
+  #if("$!forgotUsernameURL" != "")
+    <span class="xAdditional"><a href="$forgotUsernameURL">$escapetool.xml($services.localization.render('xe.admin.forgotUsername.loginMessage'))</a></span>
+  #end
+  #set ($resetPasswordUrl = $services.security.authentication.getAuthenticationURL('resetpassword', $NULL))
+  #if("$!resetPasswordUrl" != '')
+    <span class="xAdditional recoverPassword"><a href="$resetPasswordUrl" >$escapetool.xml($services.localization.render('xe.admin.passwordReset.loginMessage'))</a></span>
+  #end
+</div>
 #xwikimessageboxend()
 </form>
 </main>## mainContentArea