diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/general.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/general.less
index b209259ad312..43f87c245bfc 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/general.less
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/general.less
@@ -198,9 +198,11 @@ body {
         }
       }
 
-      /* Remove the underlining from links with the btn class.
-       Those are already styled differently from their neighboring text. */
-      & a.btn {
+      /* Remove the underlining from links styled like buttons.
+       Those are already different enough from their neighboring text. */
+      & a.btn,
+      & a.button,
+      & .buttonwrapper a {
         .not-inline-link();
       }
 
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserProfileSheet.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserProfileSheet.xml
index c2af214606f5..38829a6b96bf 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserProfileSheet.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserProfileSheet.xml
@@ -602,8 +602,8 @@ $services.localization.render('platform.core.profile.category.profile.disabled')
         #set ($enableClass = "hidden")
         #set ($disableClass = "")
       #end
-      <a href="#" id="enable" class="btn btn-success $enableClass">$services.icon.renderHTML('unlock') $services.localization.render('platform.core.profile.category.profile.enableAccount')</a>
-      <a href="#" id="disable" class="btn btn-warning $disableClass">$services.icon.renderHTML('lock') $services.localization.render('platform.core.profile.category.profile.disableAccount')</a>
+      <button id="enable" class="btn btn-success $enableClass">$services.icon.renderHTML('unlock') $services.localization.render('platform.core.profile.category.profile.enableAccount')</button>
+      <button id="disable" class="btn btn-warning $disableClass">$services.icon.renderHTML('lock') $services.localization.render('platform.core.profile.category.profile.disableAccount')</button>
     #end
     <div class='userInfo'>
     #if($xcontext.action == 'view' && $hasEdit)