diff --git a/app/views/accounts/edit.html.erb b/app/views/accounts/edit.html.erb
index cd53d294d..038f5c09f 100644
--- a/app/views/accounts/edit.html.erb
+++ b/app/views/accounts/edit.html.erb
@@ -17,7 +17,7 @@
   <%= f.password_field :pass_crypt_confirmation, :value => "", :autocomplete => "new-password" %>
 
   <fieldset class="form-group">
-    <label for="user_auth_provider"><%= t(".external auth") %></label>
+    <label for="user_auth_provider" class="form-label"><%= t(".external auth") %></label>
     <div class="row">
       <%= f.select(:auth_provider, Auth.providers, :hide_label => true, :wrapper => { :class => "col-auto mb-0" }) %>
       <%= f.text_field(:auth_uid, :hide_label => true, :wrapper => { :class => "col mb-0" }) %>
@@ -26,7 +26,7 @@
   </fieldset>
 
   <div class="form-group">
-    <label><%= t ".public editing.heading" %></label>
+    <label class="form-label"><%= t ".public editing.heading" %></label>
     <span class="form-text text-muted">
       <% if current_user.data_public? %>
         <%= t ".public editing.enabled" %>
@@ -39,7 +39,7 @@
   </div>
 
   <div class="form-group">
-    <label><%= t ".contributor terms.heading" %></label>
+    <label class="form-label"><%= t ".contributor terms.heading" %></label>
     <span class="form-text text-muted">
       <% if current_user.terms_agreed? %>
         <%= t ".contributor terms.agreed" %>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 18f536206..ddebc55a4 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -25,7 +25,7 @@
 
   <div id="loginForm">
     <div class="form-group">
-      <label><%= t ".with external" %></label>
+      <label class="form-label"><%= t ".with external" %></label>
 
       <ul class='list-unstyled' id="login_auth_buttons">
         <li><%= link_to image_tag("openid.png", :alt => t(".auth_providers.openid.title")), "#", :id => "openid_open_url", :title => t(".auth_providers.openid.title") %></li>
@@ -48,7 +48,7 @@
 
       <%= form_tag(auth_path(:provider => "openid"), :id => "openid_login_form") do %>
         <div id='login_openid_url' class="form-group">
-          <label for='openid_url'><%= t ".openid_html", :logo => openid_logo %></label>
+          <label for='openid_url' class="form-label"><%= t ".openid_html", :logo => openid_logo %></label>
           <%= hidden_field_tag("referer", params[:referer], :autocomplete => "off") %>
           <%= text_field_tag("openid_url", "", :tabindex => 3, :autocomplete => "on", :class => "openid_url form-control") %>
           <span class="form-text text-muted">(<a href="<%= t "accounts.edit.openid.link" %>" target="_new"><%= t "accounts.edit.openid.link text" %></a>)</span>
diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb
index 3591b9c0f..db7c5e057 100644
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -15,7 +15,7 @@
   <%= f.richtext_field :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
 
   <%= f.form_group do %>
-    <%= label_tag "user_block_period", t(".period") %><br />
+    <%= label_tag "user_block_period", t(".period"), :class => "form-label" %>
     <%= select_tag("user_block_period",
                    options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] }, params[:user_block_period]),
                    :class => "form-select") %>
diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb
index c1195343b..c390134ba 100644
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -9,7 +9,7 @@
   <%= f.richtext_field :reason, :cols => 80, :rows => 20 %>
 
   <%= f.form_group do %>
-    <%= label_tag "user_block_period", t(".period") %><br />
+    <%= label_tag "user_block_period", t(".period"), :class => "form-label" %>
     <%= select_tag("user_block_period",
                    options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] }, params[:user_block_period]),
                    :class => "form-select") %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 201597f4e..c53135678 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -26,7 +26,7 @@
       <%= f.text_field :display_name, :help => t(".display name description"), :tabindex => 3 %>
 
       <fieldset class="form-group" id="auth_field">
-        <label for="user_auth_provider"><%= t(".external auth") %></label>
+        <label for="user_auth_provider" class="form-label"><%= t(".external auth") %></label>
         <div class="row">
           <%= f.select(:auth_provider, Auth.providers, :default => "", :hide_label => true, :wrapper => { :class => "col-auto mb-0" }, :tabindex => 4) %>
           <%= f.text_field(:auth_uid, :hide_label => true, :wrapper => { :class => "col mb-0" }, :tabindex => 5) %>
diff --git a/app/views/users/terms.html.erb b/app/views/users/terms.html.erb
index 58bddaca5..1f42e9085 100644
--- a/app/views/users/terms.html.erb
+++ b/app/views/users/terms.html.erb
@@ -16,7 +16,7 @@
     <%= t ".heading_ct" %>
   </h4>
   <p class="text-muted"><%= t ".contributor_terms_explain" %></p>
-  <label>
+  <label class="form-label">
     <%= t ".legale_select" %>
   </label>
   <div class="form-group">